Merge branch 'master' into add-api-issues-subscriptions

.gitignore

@@ -12,6 +12,7 @@ _test
 
 # MS VSCode
 .vscode
+__debug_bin
 
 # Architecture specific extensions/prefixes
 *.[568vq]

custom/conf/app.ini.sample

@@ -69,6 +69,10 @@ MAX_FILES = 5
 [repository.pull-request]
 ; List of prefixes used in Pull Request title to mark them as Work In Progress
 WORK_IN_PROGRESS_PREFIXES=WIP:,[WIP]
+; List of keywords used in Pull Request comments to automatically close a related issue
+CLOSE_KEYWORDS=close,closes,closed,fix,fixes,fixed,resolve,resolves,resolved
+; List of keywords used in Pull Request comments to automatically reopen a related issue
+REOPEN_KEYWORDS=reopen,reopens,reopened
 
 [repository.issue]
 ; List of reasons why a Pull Request or Issue can be locked

docs/content/doc/advanced/config-cheat-sheet.en-us.md

@@ -71,6 +71,10 @@ Values containing `#` or `;` must be quoted using `` ` `` or `"""`.
 
 - `WORK_IN_PROGRESS_PREFIXES`: **WIP:,\[WIP\]**: List of prefixes used in Pull Request
  title to mark them as Work In Progress
+- `CLOSE_KEYWORDS`: **close**, **closes**, **closed**, **fix**, **fixes**, **fixed**, **resolve**, **resolves**, **resolved**: List of
+ keywords used in Pull Request comments to automatically close a related issue
+- `REOPEN_KEYWORDS`: **reopen**, **reopens**, **reopened**: List of keywords used in Pull Request comments to automatically reopen
+ a related issue
 
 ### Repository - Issue (`repository.issue`)
 

models/issue.go

@@ -750,7 +750,6 @@ func (issue *Issue) UpdateAttachments(uuids []string) (err error) {
 
 // ChangeContent changes issue content, as the given user.
 func (issue *Issue) ChangeContent(doer *User, content string) (err error) {
-	oldContent := issue.Content
 	issue.Content = content
 
 	sess := x.NewSession()
@@ -769,47 +768,7 @@ func (issue *Issue) ChangeContent(doer *User, content string) (err error) {
 		return err
 	}
 
-	if err = sess.Commit(); err != nil {
+	return sess.Commit()
-		return err
-	}
-	sess.Close()
-
-	mode, _ := AccessLevel(issue.Poster, issue.Repo)
-	if issue.IsPull {
-		issue.PullRequest.Issue = issue
-		err = PrepareWebhooks(issue.Repo, HookEventPullRequest, &api.PullRequestPayload{
-			Action: api.HookIssueEdited,
-			Index:  issue.Index,
-			Changes: &api.ChangesPayload{
-				Body: &api.ChangesFromPayload{
-					From: oldContent,
-				},
-			},
-			PullRequest: issue.PullRequest.APIFormat(),
-			Repository:  issue.Repo.APIFormat(mode),
-			Sender:      doer.APIFormat(),
-		})
-	} else {
-		err = PrepareWebhooks(issue.Repo, HookEventIssues, &api.IssuePayload{
-			Action: api.HookIssueEdited,
-			Index:  issue.Index,
-			Changes: &api.ChangesPayload{
-				Body: &api.ChangesFromPayload{
-					From: oldContent,
-				},
-			},
-			Issue:      issue.APIFormat(),
-			Repository: issue.Repo.APIFormat(mode),
-			Sender:     doer.APIFormat(),
-		})
-	}
-	if err != nil {
-		log.Error("PrepareWebhooks [is_pull: %v]: %v", issue.IsPull, err)
-	} else {
-		go HookQueue.Add(issue.RepoID)
-	}
-
-	return nil
 }
 
 // GetTasks returns the amount of tasks in the issues content

modules/notification/indexer/indexer.go

@@ -74,6 +74,11 @@ func (r *indexerNotifier) NotifyUpdateComment(doer *models.User, c *models.Comme
 
 func (r *indexerNotifier) NotifyDeleteComment(doer *models.User, comment *models.Comment) {
 	if comment.Type == models.CommentTypeComment {
+		if err := comment.LoadIssue(); err != nil {
+			log.Error("LoadIssue: %v", err)
+			return
+		}
+
 		var found bool
 		if comment.Issue.Comments != nil {
 			for i := 0; i < len(comment.Issue.Comments); i++ {

modules/notification/webhook/webhook.go

@@ -277,3 +277,124 @@ func (m *webhookNotifier) NotifyNewIssue(issue *models.Issue) {
 		go models.HookQueue.Add(issue.RepoID)
 	}
 }
+
+func (m *webhookNotifier) NotifyIssueChangeContent(doer *models.User, issue *models.Issue, oldContent string) {
+	mode, _ := models.AccessLevel(issue.Poster, issue.Repo)
+	var err error
+	if issue.IsPull {
+		issue.PullRequest.Issue = issue
+		err = models.PrepareWebhooks(issue.Repo, models.HookEventPullRequest, &api.PullRequestPayload{
+			Action: api.HookIssueEdited,
+			Index:  issue.Index,
+			Changes: &api.ChangesPayload{
+				Body: &api.ChangesFromPayload{
+					From: oldContent,
+				},
+			},
+			PullRequest: issue.PullRequest.APIFormat(),
+			Repository:  issue.Repo.APIFormat(mode),
+			Sender:      doer.APIFormat(),
+		})
+	} else {
+		err = models.PrepareWebhooks(issue.Repo, models.HookEventIssues, &api.IssuePayload{
+			Action: api.HookIssueEdited,
+			Index:  issue.Index,
+			Changes: &api.ChangesPayload{
+				Body: &api.ChangesFromPayload{
+					From: oldContent,
+				},
+			},
+			Issue:      issue.APIFormat(),
+			Repository: issue.Repo.APIFormat(mode),
+			Sender:     doer.APIFormat(),
+		})
+	}
+	if err != nil {
+		log.Error("PrepareWebhooks [is_pull: %v]: %v", issue.IsPull, err)
+	} else {
+		go models.HookQueue.Add(issue.RepoID)
+	}
+}
+
+func (m *webhookNotifier) NotifyUpdateComment(doer *models.User, c *models.Comment, oldContent string) {
+	if err := c.LoadPoster(); err != nil {
+		log.Error("LoadPoster: %v", err)
+		return
+	}
+	if err := c.LoadIssue(); err != nil {
+		log.Error("LoadIssue: %v", err)
+		return
+	}
+
+	if err := c.Issue.LoadAttributes(); err != nil {
+		log.Error("LoadAttributes: %v", err)
+		return
+	}
+
+	mode, _ := models.AccessLevel(doer, c.Issue.Repo)
+	if err := models.PrepareWebhooks(c.Issue.Repo, models.HookEventIssueComment, &api.IssueCommentPayload{
+		Action:  api.HookIssueCommentEdited,
+		Issue:   c.Issue.APIFormat(),
+		Comment: c.APIFormat(),
+		Changes: &api.ChangesPayload{
+			Body: &api.ChangesFromPayload{
+				From: oldContent,
+			},
+		},
+		Repository: c.Issue.Repo.APIFormat(mode),
+		Sender:     doer.APIFormat(),
+		IsPull:     c.Issue.IsPull,
+	}); err != nil {
+		log.Error("PrepareWebhooks [comment_id: %d]: %v", c.ID, err)
+	} else {
+		go models.HookQueue.Add(c.Issue.Repo.ID)
+	}
+}
+
+func (m *webhookNotifier) NotifyCreateIssueComment(doer *models.User, repo *models.Repository,
+	issue *models.Issue, comment *models.Comment) {
+	mode, _ := models.AccessLevel(doer, repo)
+	if err := models.PrepareWebhooks(repo, models.HookEventIssueComment, &api.IssueCommentPayload{
+		Action:     api.HookIssueCommentCreated,
+		Issue:      issue.APIFormat(),
+		Comment:    comment.APIFormat(),
+		Repository: repo.APIFormat(mode),
+		Sender:     doer.APIFormat(),
+		IsPull:     issue.IsPull,
+	}); err != nil {
+		log.Error("PrepareWebhooks [comment_id: %d]: %v", comment.ID, err)
+	} else {
+		go models.HookQueue.Add(repo.ID)
+	}
+}
+
+func (m *webhookNotifier) NotifyDeleteComment(doer *models.User, comment *models.Comment) {
+	if err := comment.LoadPoster(); err != nil {
+		log.Error("LoadPoster: %v", err)
+		return
+	}
+	if err := comment.LoadIssue(); err != nil {
+		log.Error("LoadIssue: %v", err)
+		return
+	}
+
+	if err := comment.Issue.LoadAttributes(); err != nil {
+		log.Error("LoadAttributes: %v", err)
+		return
+	}
+
+	mode, _ := models.AccessLevel(doer, comment.Issue.Repo)
+
+	if err := models.PrepareWebhooks(comment.Issue.Repo, models.HookEventIssueComment, &api.IssueCommentPayload{
+		Action:     api.HookIssueCommentDeleted,
+		Issue:      comment.Issue.APIFormat(),
+		Comment:    comment.APIFormat(),
+		Repository: comment.Issue.Repo.APIFormat(mode),
+		Sender:     doer.APIFormat(),
+		IsPull:     comment.Issue.IsPull,
+	}); err != nil {
+		log.Error("PrepareWebhooks [comment_id: %d]: %v", comment.ID, err)
+	} else {
+		go models.HookQueue.Add(comment.Issue.Repo.ID)
+	}
+}

modules/references/references.go

@@ -11,6 +11,7 @@ import (
 	"strings"
 	"sync"
 
+	"code.gitea.io/gitea/modules/log"
 	"code.gitea.io/gitea/modules/markup/mdstripper"
 	"code.gitea.io/gitea/modules/setting"
 )
@@ -35,12 +36,8 @@ var (
 	// e.g. gogits/gogs#12345
 	crossReferenceIssueNumericPattern = regexp.MustCompile(`(?:\s|^|\(|\[)([0-9a-zA-Z-_\.]+/[0-9a-zA-Z-_\.]+#[0-9]+)(?:\s|$|\)|\]|\.(\s|$))`)
 
-	// Same as GitHub. See
-	// https://help.github.com/articles/closing-issues-via-commit-messages
-	issueCloseKeywords  = []string{"close", "closes", "closed", "fix", "fixes", "fixed", "resolve", "resolves", "resolved"}
-	issueReopenKeywords = []string{"reopen", "reopens", "reopened"}
-
 	issueCloseKeywordsPat, issueReopenKeywordsPat *regexp.Regexp
+	issueKeywordsOnce                             sync.Once
 
 	giteaHostInit sync.Once
 	giteaHost     string
@@ -107,13 +104,40 @@ type RefSpan struct {
 	End   int
 }
 
-func makeKeywordsPat(keywords []string) *regexp.Regexp {
+func makeKeywordsPat(words []string) *regexp.Regexp {
-	return regexp.MustCompile(`(?i)(?:\s|^|\(|\[)(` + strings.Join(keywords, `|`) + `):? $`)
+	acceptedWords := parseKeywords(words)
+	if len(acceptedWords) == 0 {
+		// Never match
+		return nil
+	}
+	return regexp.MustCompile(`(?i)(?:\s|^|\(|\[)(` + strings.Join(acceptedWords, `|`) + `):? $`)
 }
 
-func init() {
+func parseKeywords(words []string) []string {
-	issueCloseKeywordsPat = makeKeywordsPat(issueCloseKeywords)
+	acceptedWords := make([]string, 0, 5)
-	issueReopenKeywordsPat = makeKeywordsPat(issueReopenKeywords)
+	wordPat := regexp.MustCompile(`^[\pL]+$`)
+	for _, word := range words {
+		word = strings.ToLower(strings.TrimSpace(word))
+		// Accept Unicode letter class runes (a-z, á, à, ä, )
+		if wordPat.MatchString(word) {
+			acceptedWords = append(acceptedWords, word)
+		} else {
+			log.Info("Invalid keyword: %s", word)
+		}
+	}
+	return acceptedWords
+}
+
+func newKeywords() {
+	issueKeywordsOnce.Do(func() {
+		// Delay initialization until after the settings module is initialized
+		doNewKeywords(setting.Repository.PullRequest.CloseKeywords, setting.Repository.PullRequest.ReopenKeywords)
+	})
+}
+
+func doNewKeywords(close []string, reopen []string) {
+	issueCloseKeywordsPat = makeKeywordsPat(close)
+	issueReopenKeywordsPat = makeKeywordsPat(reopen)
 }
 
 // getGiteaHostName returns a normalized string with the local host name, with no scheme or port information
@@ -310,13 +334,19 @@ func getCrossReference(content []byte, start, end int, fromLink bool) *rawRefere
 }
 
 func findActionKeywords(content []byte, start int) (XRefAction, *RefSpan) {
-	m := issueCloseKeywordsPat.FindSubmatchIndex(content[:start])
+	newKeywords()
-	if m != nil {
+	var m []int
-		return XRefActionCloses, &RefSpan{Start: m[2], End: m[3]}
+	if issueCloseKeywordsPat != nil {
+		m = issueCloseKeywordsPat.FindSubmatchIndex(content[:start])
+		if m != nil {
+			return XRefActionCloses, &RefSpan{Start: m[2], End: m[3]}
+		}
 	}
-	m = issueReopenKeywordsPat.FindSubmatchIndex(content[:start])
+	if issueReopenKeywordsPat != nil {
-	if m != nil {
+		m = issueReopenKeywordsPat.FindSubmatchIndex(content[:start])
-		return XRefActionReopens, &RefSpan{Start: m[2], End: m[3]}
+		if m != nil {
+			return XRefActionReopens, &RefSpan{Start: m[2], End: m[3]}
+		}
 	}
 	return XRefActionNone, nil
 }

modules/references/references_test.go

@@ -12,161 +12,136 @@ import (
 	"github.com/stretchr/testify/assert"
 )
 
+type testFixture struct {
+	input    string
+	expected []testResult
+}
+
+type testResult struct {
+	Index          int64
+	Owner          string
+	Name           string
+	Issue          string
+	Action         XRefAction
+	RefLocation    *RefSpan
+	ActionLocation *RefSpan
+}
+
 func TestFindAllIssueReferences(t *testing.T) {
 
-	type result struct {
-		Index          int64
-		Owner          string
-		Name           string
-		Issue          string
-		Action         XRefAction
-		RefLocation    *RefSpan
-		ActionLocation *RefSpan
-	}
-
-	type testFixture struct {
-		input    string
-		expected []result
-	}
-
 	fixtures := []testFixture{
 		{
 			"Simply closes: #29 yes",
-			[]result{
+			[]testResult{
 				{29, "", "", "29", XRefActionCloses, &RefSpan{Start: 15, End: 18}, &RefSpan{Start: 7, End: 13}},
 			},
 		},
 		{
 			"#123 no, this is a title.",
-			[]result{},
+			[]testResult{},
 		},
 		{
 			" #124 yes, this is a reference.",
-			[]result{
+			[]testResult{
 				{124, "", "", "124", XRefActionNone, &RefSpan{Start: 0, End: 4}, nil},
 			},
 		},
 		{
 			"```\nThis is a code block.\n#723 no, it's a code block.```",
-			[]result{},
+			[]testResult{},
 		},
 		{
 			"This `#724` no, it's inline code.",
-			[]result{},
+			[]testResult{},
 		},
 		{
 			"This user3/repo4#200 yes.",
-			[]result{
+			[]testResult{
 				{200, "user3", "repo4", "200", XRefActionNone, &RefSpan{Start: 5, End: 20}, nil},
 			},
 		},
 		{
 			"This [one](#919) no, this is a URL fragment.",
-			[]result{},
+			[]testResult{},
 		},
 		{
 			"This [two](/user2/repo1/issues/921) yes.",
-			[]result{
+			[]testResult{
 				{921, "user2", "repo1", "921", XRefActionNone, nil, nil},
 			},
 		},
 		{
 			"This [three](/user2/repo1/pulls/922) yes.",
-			[]result{
+			[]testResult{
 				{922, "user2", "repo1", "922", XRefActionNone, nil, nil},
 			},
 		},
 		{
 			"This [four](http://gitea.com:3000/user3/repo4/issues/203) yes.",
-			[]result{
+			[]testResult{
 				{203, "user3", "repo4", "203", XRefActionNone, nil, nil},
 			},
 		},
 		{
 			"This [five](http://github.com/user3/repo4/issues/204) no.",
-			[]result{},
+			[]testResult{},
 		},
 		{
 			"This http://gitea.com:3000/user4/repo5/201 no, bad URL.",
-			[]result{},
+			[]testResult{},
 		},
 		{
 			"This http://gitea.com:3000/user4/repo5/pulls/202 yes.",
-			[]result{
+			[]testResult{
 				{202, "user4", "repo5", "202", XRefActionNone, nil, nil},
 			},
 		},
 		{
 			"This http://GiTeA.COM:3000/user4/repo6/pulls/205 yes.",
-			[]result{
+			[]testResult{
 				{205, "user4", "repo6", "205", XRefActionNone, nil, nil},
 			},
 		},
 		{
 			"Reopens #15 yes",
-			[]result{
+			[]testResult{
 				{15, "", "", "15", XRefActionReopens, &RefSpan{Start: 8, End: 11}, &RefSpan{Start: 0, End: 7}},
 			},
 		},
 		{
 			"This closes #20 for you yes",
-			[]result{
+			[]testResult{
 				{20, "", "", "20", XRefActionCloses, &RefSpan{Start: 12, End: 15}, &RefSpan{Start: 5, End: 11}},
 			},
 		},
 		{
 			"Do you fix user6/repo6#300 ? yes",
-			[]result{
+			[]testResult{
 				{300, "user6", "repo6", "300", XRefActionCloses, &RefSpan{Start: 11, End: 26}, &RefSpan{Start: 7, End: 10}},
 			},
 		},
 		{
 			"For 999 #1235 no keyword, but yes",
-			[]result{
+			[]testResult{
 				{1235, "", "", "1235", XRefActionNone, &RefSpan{Start: 8, End: 13}, nil},
 			},
 		},
 		{
 			"Which abc. #9434 same as above",
-			[]result{
+			[]testResult{
 				{9434, "", "", "9434", XRefActionNone, &RefSpan{Start: 11, End: 16}, nil},
 			},
 		},
 		{
 			"This closes #600 and reopens #599",
-			[]result{
+			[]testResult{
 				{600, "", "", "600", XRefActionCloses, &RefSpan{Start: 12, End: 16}, &RefSpan{Start: 5, End: 11}},
 				{599, "", "", "599", XRefActionReopens, &RefSpan{Start: 29, End: 33}, &RefSpan{Start: 21, End: 28}},
 			},
 		},
 	}
 
-	// Save original value for other tests that may rely on it
+	testFixtures(t, fixtures, "default")
-	prevURL := setting.AppURL
-	setting.AppURL = "https://gitea.com:3000/"
-
-	for _, fixture := range fixtures {
-		expraw := make([]*rawReference, len(fixture.expected))
-		for i, e := range fixture.expected {
-			expraw[i] = &rawReference{
-				index:          e.Index,
-				owner:          e.Owner,
-				name:           e.Name,
-				action:         e.Action,
-				issue:          e.Issue,
-				refLocation:    e.RefLocation,
-				actionLocation: e.ActionLocation,
-			}
-		}
-		expref := rawToIssueReferenceList(expraw)
-		refs := FindAllIssueReferencesMarkdown(fixture.input)
-		assert.EqualValues(t, expref, refs, "Failed to parse: {%s}", fixture.input)
-		rawrefs := findAllIssueReferencesMarkdown(fixture.input)
-		assert.EqualValues(t, expraw, rawrefs, "Failed to parse: {%s}", fixture.input)
-	}
-
-	// Restore for other tests that may rely on the original value
-	setting.AppURL = prevURL
 
 	type alnumFixture struct {
 		input          string
@@ -203,6 +178,35 @@ func TestFindAllIssueReferences(t *testing.T) {
 	}
 }
 
+func testFixtures(t *testing.T, fixtures []testFixture, context string) {
+	// Save original value for other tests that may rely on it
+	prevURL := setting.AppURL
+	setting.AppURL = "https://gitea.com:3000/"
+
+	for _, fixture := range fixtures {
+		expraw := make([]*rawReference, len(fixture.expected))
+		for i, e := range fixture.expected {
+			expraw[i] = &rawReference{
+				index:          e.Index,
+				owner:          e.Owner,
+				name:           e.Name,
+				action:         e.Action,
+				issue:          e.Issue,
+				refLocation:    e.RefLocation,
+				actionLocation: e.ActionLocation,
+			}
+		}
+		expref := rawToIssueReferenceList(expraw)
+		refs := FindAllIssueReferencesMarkdown(fixture.input)
+		assert.EqualValues(t, expref, refs, "[%s] Failed to parse: {%s}", context, fixture.input)
+		rawrefs := findAllIssueReferencesMarkdown(fixture.input)
+		assert.EqualValues(t, expraw, rawrefs, "[%s] Failed to parse: {%s}", context, fixture.input)
+	}
+
+	// Restore for other tests that may rely on the original value
+	setting.AppURL = prevURL
+}
+
 func TestRegExp_mentionPattern(t *testing.T) {
 	trueTestCases := []string{
 		"@Unknwon",
@@ -294,3 +298,75 @@ func TestRegExp_issueAlphanumericPattern(t *testing.T) {
 		assert.False(t, issueAlphanumericPattern.MatchString(testCase))
 	}
 }
+
+func TestCustomizeCloseKeywords(t *testing.T) {
+	fixtures := []testFixture{
+		{
+			"Simplemente cierra: #29 yes",
+			[]testResult{
+				{29, "", "", "29", XRefActionCloses, &RefSpan{Start: 20, End: 23}, &RefSpan{Start: 12, End: 18}},
+			},
+		},
+		{
+			"Closes: #123 no, this English.",
+			[]testResult{
+				{123, "", "", "123", XRefActionNone, &RefSpan{Start: 8, End: 12}, nil},
+			},
+		},
+		{
+			"Cerró user6/repo6#300 yes",
+			[]testResult{
+				{300, "user6", "repo6", "300", XRefActionCloses, &RefSpan{Start: 7, End: 22}, &RefSpan{Start: 0, End: 6}},
+			},
+		},
+		{
+			"Reabre user3/repo4#200 yes",
+			[]testResult{
+				{200, "user3", "repo4", "200", XRefActionReopens, &RefSpan{Start: 7, End: 22}, &RefSpan{Start: 0, End: 6}},
+			},
+		},
+	}
+
+	issueKeywordsOnce.Do(func() {})
+
+	doNewKeywords([]string{"cierra", "cerró"}, []string{"reabre"})
+	testFixtures(t, fixtures, "spanish")
+
+	// Restore default settings
+	doNewKeywords(setting.Repository.PullRequest.CloseKeywords, setting.Repository.PullRequest.ReopenKeywords)
+}
+
+func TestParseCloseKeywords(t *testing.T) {
+	// Test parsing of CloseKeywords and ReopenKeywords
+	assert.Len(t, parseKeywords([]string{""}), 0)
+	assert.Len(t, parseKeywords([]string{"  aa  ", " bb  ", "99", "#", "", "this is", "cc"}), 3)
+
+	for _, test := range []struct {
+		pattern  string
+		match    string
+		expected string
+	}{
+		{"close", "This PR will close ", "close"},
+		{"cerró", "cerró ", "cerró"},
+		{"cerró", "AQUÍ SE CERRÓ: ", "CERRÓ"},
+		{"закрывается", "закрывается ", "закрывается"},
+		{"κλείνει", "κλείνει: ", "κλείνει"},
+		{"关闭", "关闭 ", "关闭"},
+		{"閉じます", "閉じます ", "閉じます"},
+		{",$!", "", ""},
+		{"1234", "", ""},
+	} {
+		// The patern only needs to match the part that precedes the reference.
+		// getCrossReference() takes care of finding the reference itself.
+		pat := makeKeywordsPat([]string{test.pattern})
+		if test.expected == "" {
+			assert.Nil(t, pat)
+		} else {
+			assert.NotNil(t, pat)
+			res := pat.FindAllStringSubmatch(test.match, -1)
+			assert.Len(t, res, 1)
+			assert.Len(t, res[0], 2)
+			assert.EqualValues(t, test.expected, res[0][1])
+		}
+	}
+}

modules/setting/repository.go

@@ -59,6 +59,8 @@ var (
 		// Pull request settings
 		PullRequest struct {
 			WorkInProgressPrefixes []string
+			CloseKeywords          []string
+			ReopenKeywords         []string
 		} `ini:"repository.pull-request"`
 
 		// Issue Setting
@@ -122,8 +124,14 @@ var (
 		// Pull request settings
 		PullRequest: struct {
 			WorkInProgressPrefixes []string
+			CloseKeywords          []string
+			ReopenKeywords         []string
 		}{
 			WorkInProgressPrefixes: []string{"WIP:", "[WIP]"},
+			// Same as GitHub. See
+			// https://help.github.com/articles/closing-issues-via-commit-messages
+			CloseKeywords:  strings.Split("close,closes,closed,fix,fixes,fixed,resolve,resolves,resolved", ","),
+			ReopenKeywords: strings.Split("reopen,reopens,reopened", ","),
 		},
 
 		// Issue settings

options/license/AAL

@@ -1,7 +1,5 @@
-Attribution Assurance License
+Attribution Assurance License Copyright (c) 2002 by AUTHOR PROFESSIONAL IDENTIFICATION
-
+* URL "PROMOTIONAL SLOGAN FOR AUTHOR'S PROFESSIONAL PRACTICE"
-Copyright (c) 2002 by AUTHOR PROFESSIONAL IDENTIFICATION * URL "PROMOTIONAL
-SLOGAN FOR AUTHOR'S PROFESSIONAL PRACTICE"
 
 All Rights Reserved ATTRIBUTION ASSURANCE LICENSE (adapted from the original
 BSD license)

options/license/ADSL

@@ -1,6 +1,6 @@
 This software code is made available "AS IS" without warranties of any kind.
 You may copy, display, modify and redistribute the software code either by
-itself or as incorporated into your code; provided that > you do not remove
+itself or as incorporated into your code; provided that you do not remove
 any proprietary notices. Your use of this software code is at your own risk
 and you waive any claim against Amazon Digital Services, Inc. or its affiliates
 with respect to your use of this software code. (c) 2006 Amazon Digital Services,

options/license/AFL-1.1

@@ -4,7 +4,7 @@ Version 1.1 The Academic Free License applies to any original work of authorship
 (the "Original Work") whose owner (the "Licensor") has placed the following
 notice immediately following the copyright notice for the Original Work:
 
-" Licensed under the Academic Free License version 1.1. "
+"Licensed under the Academic Free License version 1.1."
 
 Grant of License. Licensor hereby grants to any person obtaining a copy of
 the Original Work ("You") a world-wide, royalty-free, non-exclusive, perpetual,

options/license/AGPL-3.0-only

@@ -2,7 +2,7 @@ GNU AFFERO GENERAL PUBLIC LICENSE
 
 Version 3, 19 November 2007
 
-Copyright (C) 2007 Free Software Foundation, Inc. <http s ://fsf.org/>
+Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
 
 Everyone is permitted to copy and distribute verbatim copies of this license
 document, but changing it is not allowed.
@@ -597,7 +597,7 @@ FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more
 details.
 
 You should have received a copy of the GNU Affero General Public License along
-with this program. If not, see <http s ://www.gnu.org/licenses/>.
+with this program. If not, see <https://www.gnu.org/licenses/>.
 
 Also add information on how to contact you by electronic and paper mail.
 
@@ -610,5 +610,4 @@ programs; see section 13 for the specific requirements.
 
 You should also get your employer (if you work as a programmer) or school,
 if any, to sign a "copyright disclaimer" for the program, if necessary. For
-more information on this, and how to apply and follow the GNU AGPL, see <http
+more information on this, and how to apply and follow the GNU AGPL, see <https://www.gnu.org/licenses/>.
-s ://www.gnu.org/licenses/>.

options/license/AGPL-3.0-or-later

@@ -2,7 +2,7 @@ GNU AFFERO GENERAL PUBLIC LICENSE
 
 Version 3, 19 November 2007
 
-Copyright (C) 2007 Free Software Foundation, Inc. <http s ://fsf.org/>
+Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
 
 Everyone is permitted to copy and distribute verbatim copies of this license
 document, but changing it is not allowed.
@@ -597,7 +597,7 @@ FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more
 details.
 
 You should have received a copy of the GNU Affero General Public License along
-with this program. If not, see <http s ://www.gnu.org/licenses/>.
+with this program. If not, see <https://www.gnu.org/licenses/>.
 
 Also add information on how to contact you by electronic and paper mail.
 
@@ -610,5 +610,4 @@ programs; see section 13 for the specific requirements.
 
 You should also get your employer (if you work as a programmer) or school,
 if any, to sign a "copyright disclaimer" for the program, if necessary. For
-more information on this, and how to apply and follow the GNU AGPL, see <http
+more information on this, and how to apply and follow the GNU AGPL, see <https://www.gnu.org/licenses/>.
-s ://www.gnu.org/licenses/>.

options/license/Adobe-2006

@@ -1,6 +1,5 @@
-Adobe Systems Incorporated(r) Source Code License Agreement
+Adobe Systems Incorporated(r) Source Code License Agreement Copyright(c) 2006
-
+Adobe Systems Incorporated. All rights reserved.
-Copyright(c) 2006 Adobe Systems Incorporated. All rights reserved.
 
 Please read this Source Code License Agreement carefully before using the
 source code.

options/license/Aladdin

@@ -1,8 +1,7 @@
 Aladdin Free Public License
 
-(Version 8, November 18, 1999)
+(Version 8, November 18, 1999) Copyright (C) 1994, 1995, 1997, 1998, 1999
-
+Aladdin Enterprises,
-Copyright (C) 1994, 1995, 1997, 1998, 1999 Aladdin Enterprises,
 
 Menlo Park, California, U.S.A. All rights reserved. NOTE: This License is
 not the same as any of the GNU Licenses published by the Free Software Foundation.

options/license/Apache-1.1

@@ -1,6 +1,5 @@
-Apache License 1.1
+Apache License 1.1 Copyright (c) 2000 The Apache Software Foundation. All
-
+rights reserved.
-Copyright (c) 2000 The Apache Software Foundation . All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,
 are permitted provided that the following conditions are met:

options/license/Autoconf-exception-3.0

@@ -1,8 +1,6 @@
 AUTOCONF CONFIGURE SCRIPT EXCEPTION
 
-Version 3.0, 18 August 2009
+Version 3.0, 18 August 2009 Copyright © 2009 Free Software Foundation, Inc. <http://fsf.org/>
-
-Copyright © 2009 Free Software Foundation, Inc. <http://fsf.org/>
 
 Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed.
 

options/license/BSD-2-Clause

@@ -1,4 +1,4 @@
-Copyright (c) <year> <owner> . All rights reserved.
+Copyright (c) <year> <owner>. All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,
 are permitted provided that the following conditions are met:

options/license/BSD-2-Clause-FreeBSD

@@ -1,6 +1,5 @@
-The FreeBSD Copyright
+The FreeBSD Copyright Copyright 1992-2012 The FreeBSD Project. All rights
-
+reserved.
-Copyright 1992-2012 The FreeBSD Project. All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,
 are permitted provided that the following conditions are met:

options/license/BSD-3-Clause

@@ -1,4 +1,4 @@
-Copyright (c) <year> <owner> . All rights reserved.
+Copyright (c) <year> <owner>. All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,
 are permitted provided that the following conditions are met:

options/license/BSD-3-Clause-Clear

@@ -1,6 +1,4 @@
-The Clear BSD License
+The Clear BSD License Copyright (c) [xxxx]-[xxxx] [Owner Organization]
-
-Copyright (c) [xxxx]-[xxxx] [Owner Organization]
 
 All rights reserved.
 

options/license/BSD-4-Clause

@@ -1,4 +1,4 @@
-Copyright (c) <year> <owner> . All rights reserved.
+Copyright (c) <year> <owner>. All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,
 are permitted provided that the following conditions are met:

options/license/CC-BY-ND-2.0

@@ -202,4 +202,4 @@ consent of Creative Commons. Any permitted use will be in compliance with
 Creative Commons' then-current trademark usage guidelines, as may be published
 on its website or otherwise made available upon request from time to time.
 
-Creative Commons may be contacted at http s ://creativecommons.org/.
+Creative Commons may be contacted at https://creativecommons.org/.

options/license/CUA-OPL-1.0

@@ -378,7 +378,7 @@ portions of the Covered Code under Your choice of the NPL or the alternative
 licenses, if any, specified by the Initial Developer in the file described
 in Exhibit A. EXHIBIT A - CUA Office Public License.
 
-" The contents of this file are subject to the CUA Office Public License Version
+"The contents of this file are subject to the CUA Office Public License Version
 1.0 (the "License"); you may not use this file except in compliance with the
 License. You may obtain a copy of the License at http://cuaoffice.sourceforge.net/
 
@@ -402,7 +402,7 @@ to allow others to use your version of this file under the CUAPL, indicate
 your decision by deleting the provisions above and replace them with the notice
 and other provisions required by the [___] License. If you do not delete the
 provisions above, a recipient may use your version of this file under either
-the CUAPL or the [___] License. "
+the CUAPL or the [___] License."
 
 [NOTE: The text of this Exhibit A may differ slightly from the text of the
 notices in the Source Code files of the Original Code. You should use the

options/license/Condor-1.1

@@ -1,11 +1,10 @@
 Condor Public License
 
-Version 1.1, October 30, 2003
+Version 1.1, October 30, 2003 Copyright © 1990-2006 Condor Team, Computer
-
+Sciences Department, University of Wisconsin-Madison, Madison, WI. All Rights
-Copyright © 1990-2006 Condor Team, Computer Sciences Department, University
+Reserved. For more information contact: Condor Team, Attention: Professor
-of Wisconsin-Madison, Madison, WI. All Rights Reserved. For more information
+Miron Livny, Dept of Computer Sciences, 1210 W. Dayton St., Madison, WI 53706-1685,
-contact: Condor Team, Attention: Professor Miron Livny, Dept of Computer Sciences,
+(608) 262-0856 or miron@cs.wisc.edu.
-1210 W. Dayton St., Madison, WI 53706-1685, (608) 262-0856 or miron@cs.wisc.edu.
 
 This software referred to as the Condor® Version 6.x software ("Software")
 was developed by the Condor Project, Condor Team, Computer Sciences Department,

options/license/Cube

@@ -1,6 +1,5 @@
-Cube game engine source code, 20 dec 2003 release.
+Cube game engine source code, 20 dec 2003 release. Copyright (C) 2001-2003
-
+Wouter van Oortmerssen.
-Copyright (C) 2001-2003 Wouter van Oortmerssen.
 
 This software is provided 'as-is', without any express or implied warranty.
 In no event will the authors be held liable for any damages arising from the

options/license/DSDP

@@ -1,6 +1,4 @@
-COPYRIGHT NOTIFICATION
+COPYRIGHT NOTIFICATION (C) COPYRIGHT 2004 UNIVERSITY OF CHICAGO
-
-(C) COPYRIGHT 2004 UNIVERSITY OF CHICAGO
 
 This program discloses material protectable under copyright laws of the United
 States. Permission to copy and modify this software and its documentation

options/license/EUDatagrid

@@ -1,6 +1,4 @@
-EU DataGrid Software License
+EU DataGrid Software License Copyright (c) 2001 EU DataGrid. All rights reserved.
-
-Copyright (c) 2001 EU DataGrid. All rights reserved.
 
 This software includes voluntary contributions made to the EU DataGrid. For
 more information on the EU DataGrid, please see http://www.eu-datagrid.org/.

options/license/EUPL-1.0

@@ -1,10 +1,9 @@
-European Union Public Licence V.1.0
+European Union Public Licence V.1.0 EUPL (c) the European Community 2007 This
-
+European Union Public Licence (the "EUPL") applies to the Work or Software
-EUPL (c) the European Community 2007 This European Union Public Licence (the
+(as defined below) which is provided under the terms of this Licence. Any
-"EUPL") applies to the Work or Software (as defined below) which is provided
+use of the Work, other than as authorised under this Licence is prohibited
-under the terms of this Licence. Any use of the Work, other than as authorised
+(to the extent such use is covered by a right of the copyright holder of the
-under this Licence is prohibited (to the extent such use is covered by a right
+Work).
-of the copyright holder of the Work).
 
 The Original Work is provided under the terms of this Licence when the Licensor
 (as defined below) has placed the following notice immediately following the

options/license/EUPL-1.1

@@ -1,6 +1,4 @@
-European Union Public Licence V. 1.1
+European Union Public Licence V. 1.1 EUPL (c) the European Community 2007
-
-EUPL (c) the European Community 2007
 
 This European Union Public Licence (the "EUPL") applies to the Work or Software
 (as defined below) which is provided under the terms of this Licence. Any

options/license/Entessa

@@ -1,6 +1,5 @@
-Entessa Public License Version. 1.0
+Entessa Public License Version. 1.0 Copyright (c) 2003 Entessa, LLC. All rights
-
+reserved.
-Copyright (c) 2003 Entessa, LLC. All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,
 are permitted provided that the following conditions are met:

options/license/Fair

@@ -1,6 +1,4 @@
-Fair License
+Fair License <Copyright Information>
-
-<Copyright Information>
 
 Usage of the works is permitted provided that this instrument is retained
 with the works, so that any entity that uses the works is notified of this

options/license/GFDL-1.3-only

@@ -1,9 +1,7 @@
 GNU Free Documentation License
 
-Version 1.3, 3 November 2008
+Version 1.3, 3 November 2008 Copyright (C) 2000, 2001, 2002, 2007, 2008 Free
-
+Software Foundation, Inc. <http://fsf.org/>
-Copyright (C) 2000, 2001, 2002, 2007, 2008 Free Software Foundation, Inc.
-<http://fsf.org/>
 
 Everyone is permitted to copy and distribute verbatim copies of this license
 document, but changing it is not allowed.

options/license/GFDL-1.3-or-later

@@ -1,9 +1,7 @@
 GNU Free Documentation License
 
-Version 1.3, 3 November 2008
+Version 1.3, 3 November 2008 Copyright (C) 2000, 2001, 2002, 2007, 2008 Free
-
+Software Foundation, Inc. <http://fsf.org/>
-Copyright (C) 2000, 2001, 2002, 2007, 2008 Free Software Foundation, Inc.
-<http://fsf.org/>
 
 Everyone is permitted to copy and distribute verbatim copies of this license
 document, but changing it is not allowed.

options/license/GL2PS

@@ -1,6 +1,4 @@
-GL2PS LICENSE Version 2, November 2003
+GL2PS LICENSE Version 2, November 2003 Copyright (C) 2003, Christophe Geuzaine
-
-Copyright (C) 2003, Christophe Geuzaine
 
 Permission to use, copy, and distribute this software and its documentation
 for any purpose with or without fee is hereby granted, provided that the copyright

options/license/GPL-2.0-only

@@ -4,7 +4,7 @@ Version 2, June 1991
 
 Copyright (C) 1989, 1991 Free Software Foundation, Inc. 
 
-51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 , USA
+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
 
 Everyone is permitted to copy and distribute verbatim copies of this license
 document, but changing it is not allowed.
@@ -272,9 +272,9 @@ them to the start of each source file to most effectively convey the exclusion
 of warranty; and each file should have at least the "copyright" line and a
 pointer to where the full notice is found.
 
-< one line to give the program's name and an idea of what it does. >
+<one line to give the program's name and an idea of what it does.>
 
-Copyright (C) < yyyy > < name of author >
+Copyright (C)< yyyy> <name of author>
 
 This program is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free Software
@@ -287,7 +287,7 @@ FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc., 51 Franklin
-Street, Fifth Floor, Boston, MA 02110-1301 , USA.
+Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
 Also add information on how to contact you by electronic and paper mail.
 
@@ -311,7 +311,7 @@ is a sample; alter the names:
 Yoyodyne, Inc., hereby disclaims all copyright interest in the program `Gnomovision'
 (which makes passes at compilers) written by James Hacker.
 
-< signature of Ty Coon > , 1 April 1989 Ty Coon, President of Vice This General
+<signature of Ty Coon >, 1 April 1989 Ty Coon, President of Vice This General
 Public License does not permit incorporating your program into proprietary
 programs. If your program is a subroutine library, you may consider it more
 useful to permit linking proprietary applications with the library. If this

options/license/GPL-2.0-or-later

@@ -4,7 +4,7 @@ Version 2, June 1991
 
 Copyright (C) 1989, 1991 Free Software Foundation, Inc. 
 
-51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 , USA
+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
 
 Everyone is permitted to copy and distribute verbatim copies of this license
 document, but changing it is not allowed.
@@ -287,7 +287,7 @@ FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc., 51 Franklin
-Street, Fifth Floor, Boston, MA 02110-1301 , USA.
+Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
 Also add information on how to contact you by electronic and paper mail.
 
@@ -311,7 +311,7 @@ is a sample; alter the names:
 Yoyodyne, Inc., hereby disclaims all copyright interest in the program `Gnomovision'
 (which makes passes at compilers) written by James Hacker.
 
-< signature of Ty Coon > , 1 April 1989 Ty Coon, President of Vice This General
+<signature of Ty Coon>, 1 April 1989 Ty Coon, President of Vice This General
 Public License does not permit incorporating your program into proprietary
 programs. If your program is a subroutine library, you may consider it more
 useful to permit linking proprietary applications with the library. If this

options/license/GPL-3.0-only

@@ -2,7 +2,7 @@ GNU GENERAL PUBLIC LICENSE
 
 Version 3, 29 June 2007
 
-Copyright © 2007 Free Software Foundation, Inc. <http s ://fsf.org/>
+Copyright © 2007 Free Software Foundation, Inc. <https://fsf.org/>
 
 Everyone is permitted to copy and distribute verbatim copies of this license
 document, but changing it is not allowed.
@@ -595,7 +595,7 @@ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
 FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License along with
-this program. If not, see <http s ://www.gnu.org/licenses/>.
+this program. If not, see <https://www.gnu.org/licenses/>.
 
 Also add information on how to contact you by electronic and paper mail.
 
@@ -615,12 +615,11 @@ be different; for a GUI interface, you would use an "about box".
 
 You should also get your employer (if you work as a programmer) or school,
 if any, to sign a "copyright disclaimer" for the program, if necessary. For
-more information on this, and how to apply and follow the GNU GPL, see <http
+more information on this, and how to apply and follow the GNU GPL, see <https://www.gnu.org/licenses/>.
-s ://www.gnu.org/licenses/>.
 
 The GNU General Public License does not permit incorporating your program
 into proprietary programs. If your program is a subroutine library, you may
 consider it more useful to permit linking proprietary applications with the
 library. If this is what you want to do, use the GNU Lesser General Public
-License instead of this License. But first, please read <http s ://www.gnu.org/
+License instead of this License. But first, please read <https://www.gnu.org/
 licenses /why-not-lgpl.html>.

options/license/GPL-3.0-or-later

@@ -2,7 +2,7 @@ GNU GENERAL PUBLIC LICENSE
 
 Version 3, 29 June 2007
 
-Copyright © 2007 Free Software Foundation, Inc. <http s ://fsf.org/>
+Copyright © 2007 Free Software Foundation, Inc. <https://fsf.org/>
 
 Everyone is permitted to copy and distribute verbatim copies of this license
 document, but changing it is not allowed.
@@ -595,7 +595,7 @@ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
 FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License along with
-this program. If not, see <http s ://www.gnu.org/licenses/>.
+this program. If not, see <https://www.gnu.org/licenses/>.
 
 Also add information on how to contact you by electronic and paper mail.
 
@@ -615,12 +615,11 @@ be different; for a GUI interface, you would use an "about box".
 
 You should also get your employer (if you work as a programmer) or school,
 if any, to sign a "copyright disclaimer" for the program, if necessary. For
-more information on this, and how to apply and follow the GNU GPL, see <http
+more information on this, and how to apply and follow the GNU GPL, see <https://www.gnu.org/licenses/>.
-s ://www.gnu.org/licenses/>.
 
 The GNU General Public License does not permit incorporating your program
 into proprietary programs. If your program is a subroutine library, you may
 consider it more useful to permit linking proprietary applications with the
 library. If this is what you want to do, use the GNU Lesser General Public
-License instead of this License. But first, please read <http s ://www.gnu.org/
+License instead of this License. But first, please read <https://www.gnu.org/
 licenses /why-not-lgpl.html>.

options/license/HPND

@@ -1,10 +1,8 @@
-Historical Permission Notice and Disclaimer
+Historical Permission Notice and Disclaimer <copyright notice>
-
-<copyright notice>
 
 Permission to use, copy, modify and distribute this software and its documentation
 for any purpose and without fee is hereby granted, provided that the above
-copyright notice appear in all copies , and that both that the copyright notice
+copyright notice appear in all copies, and that both that the copyright notice
 and this permission notice appear in supporting documentation , and that the
 name of <copyright holder> <or related entities> not be used in advertising
 or publicity pertaining to distribution of the software without specific,

options/license/ICU

@@ -1,8 +1,7 @@
 ICU License - ICU 1.8.1 and later
 
-COPYRIGHT AND PERMISSION NOTICE
+COPYRIGHT AND PERMISSION NOTICE Copyright (c) 1995-2014 International Business
-
+Machines Corporation and others
-Copyright (c) 1995-2014 International Business Machines Corporation and others
 
 All rights reserved.
 

options/license/ISC

@@ -1,6 +1,4 @@
-ISC License
+ISC License Copyright (c) 2004-2010 by Internet Systems Consortium, Inc. ("ISC")
-
-Copyright (c) 2004-2010 by Internet Systems Consortium, Inc. ("ISC")
 
 Copyright (c) 1995-2003 by Internet Software Consortium
 

options/license/ImageMagick

@@ -64,10 +64,9 @@ you need to acknowledge the use of the ImageMagick software;
 Terms and Conditions for Use, Reproduction, and Distribution
 
 The legally binding and authoritative terms and conditions for use, reproduction,
-and distribution of ImageMagick follow:
+and distribution of ImageMagick follow: Copyright 1999-2013 ImageMagick Studio
-
+LLC, a non-profit organization dedicated to making software imaging solutions
-Copyright 1999-2013 ImageMagick Studio LLC, a non-profit organization dedicated
+freely available.
-to making software imaging solutions freely available.
 
    1. Definitions.
 

options/license/Info-ZIP

@@ -1,6 +1,4 @@
-Info-ZIP License
+Info-ZIP License Copyright (c) 1990-2009 Info-ZIP. All rights reserved.
-
-Copyright (c) 1990-2009 Info-ZIP. All rights reserved.
 
 For the purposes of this copyright and license, "Info-ZIP" is defined as the
 following set of individuals:

options/license/Intel

@@ -1,6 +1,4 @@
-Intel Open Source License
+Intel Open Source License Copyright (c) 1996-2000 Intel Corporation
-
-Copyright (c) 1996-2000 Intel Corporation
 
 All rights reserved.
 

options/license/Interbase-1.0

@@ -429,7 +429,7 @@ in Exhibit A.
 
    EXHIBIT A - InterBase Public License.
 
-" The contents of this file are subject to the Interbase Public License Version
+"The contents of this file are subject to the Interbase Public License Version
 1.0 (the "License"); you may not use this file except in compliance with the
 License. You may obtain a copy of the License at http://www.Interbase.com/IPL.html
 

options/license/JSON

@@ -1,6 +1,4 @@
-JSON License
+JSON License Copyright (c) 2002 JSON.org
-
-Copyright (c) 2002 JSON.org
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

options/license/JasPer-2.0

@@ -1,6 +1,4 @@
-JasPer License Version 2.0
+JasPer License Version 2.0 Copyright (c) 2001-2006 Michael David Adams
-
-Copyright (c) 2001-2006 Michael David Adams
 
 Copyright (c) 1999-2000 Image Power, Inc.
 

options/license/LAL-1.3

@@ -1,6 +1,6 @@
 Licence Art Libre 1.3 (LAL 1.3)
 
-Préambule :
+Préambule :
 
 Avec la Licence Art Libre, l'autorisation est donnée de copier, de diffuser
 et de transformer librement les œuvres dans le respect des droits de l'auteur.
@@ -12,44 +12,44 @@ d'expression.
 
 Si, en règle générale, l'application du droit d'auteur conduit à restreindre
 l'accès aux œuvres de l'esprit, la Licence Art Libre, au contraire, le favorise.
-L'intention est d'autoriser l'utilisation des ressources d'une œuvre ; créer
+L'intention est d'autoriser l'utilisation des ressources d'une œuvre ; créer
 de nouvelles conditions de création pour amplifier les possibilités de création.
 La Licence Art Libre permet d'avoir jouissance des œuvres tout en reconnaissant
 les droits et les responsabilités de chacun.
 
 Avec le développement du numérique, l'invention d'internet et des logiciels
-libres, les modalités de création ont évolué : les productions de l'esprit
+libres, les modalités de création ont évolué : les productions de l'esprit
 s'offrent naturellement à la circulation, à l'échange et aux transformations.
 Elles se prêtent favorablement à la réalisation d'œuvres communes que chacun
 peut augmenter pour l'avantage de tous.
 
-C'est la raison essentielle de la Licence Art Libre : promouvoir et protéger
+C'est la raison essentielle de la Licence Art Libre : promouvoir et protéger
-ces productions de l'esprit selon les principes du copyleft : liberté d'usage,
+ces productions de l'esprit selon les principes du copyleft : liberté d'usage,
 de copie, de diffusion, de transformation et interdiction d'appropriation
 exclusive.
 
-Définitions :
+Définitions :
 
-Nous désignons par « œuvre », autant l'œuvre initiale, les œuvres conséquentes,
+Nous désignons par « œuvre », autant l'œuvre initiale, les œuvres conséquentes,
-que l'œuvre commune telles que définies ci-après :
+que l'œuvre commune telles que définies ci-après :
 
-L'œuvre commune : Il s'agit d'une œuvre qui comprend l'œuvre initiale ainsi
+L'œuvre commune : Il s'agit d'une œuvre qui comprend l'œuvre initiale ainsi
 que toutes les contributions postérieures (les originaux conséquents et les
 copies). Elle est créée à l'initiative de l'auteur initial qui par cette licence
 définit les conditions selon lesquelles les contributions sont faites.
 
-L'œuvre initiale : C'est-à-dire l'œuvre créée par l'initiateur de l'œuvre
+L'œuvre initiale : C'est-à-dire l'œuvre créée par l'initiateur de l'œuvre
 commune dont les copies vont être modifiées par qui le souhaite.
 
-Les œuvres conséquentes : C'est-à-dire les contributions des auteurs qui participent
+Les œuvres conséquentes : C'est-à-dire les contributions des auteurs qui participent
 à la formation de l'œuvre commune en faisant usage des droits de reproduction,
 de diffusion et de modification que leur confère la licence.
 
-Originaux (sources ou ressources de l'œuvre) : Chaque exemplaire daté de l'œuvre
+Originaux (sources ou ressources de l'œuvre) : Chaque exemplaire daté de l'œuvre
 initiale ou conséquente que leurs auteurs présentent comme référence pour
 toutes actualisations, interprétations, copies ou reproductions ultérieures.
 
-Copie : Toute reproduction d'un original au sens de cette licence.
+Copie : Toute reproduction d'un original au sens de cette licence.
 
    1- OBJET.
 
@@ -70,33 +70,30 @@ personne, quelle que soit la technique employée.
 
 Vous pouvez diffuser librement les copies de ces œuvres, modifiées ou non,
 quel que soit le support, quel que soit le lieu, à titre onéreux ou gratuit,
-si vous respectez toutes les conditions suivantes :
+si vous respectez toutes les conditions suivantes :
 
 1. joindre aux copies cette licence à l'identique ou indiquer précisément
-où se trouve la licence ;
+où se trouve la licence ;
 
 2. indiquer au destinataire le nom de chaque auteur des originaux, y compris
-le vôtre si vous avez modifié l'œuvre ;
+le vôtre si vous avez modifié l'œuvre ;
 
 3. indiquer au destinataire où il pourrait avoir accès aux originaux (initiaux
-et/ou conséquents).
+et/ou conséquents). Les auteurs des originaux pourront, s'ils le souhaitent,
-
+vous autoriser à diffuser l'original dans les mêmes conditions que les copies.
-Les auteurs des originaux pourront, s'ils le souhaitent, vous autoriser à
-diffuser l'original dans les mêmes conditions que les copies.
 
       2.3 LA LIBERTÉ DE MODIFIER.
 
 Vous avez la liberté de modifier les copies des originaux (initiaux et conséquents)
-dans le respect des conditions suivantes :
+dans le respect des conditions suivantes :
 
-1. celles prévues à l'article 2.2 en cas de diffusion de la copie modifiée
+1. celles prévues à l'article 2.2 en cas de diffusion de la copie modifiée ;
-;
 
 2. indiquer qu'il s'agit d'une œuvre modifiée et, si possible, la nature de
-la modification ;
+la modification ;
 
 3. diffuser cette œuvre conséquente avec la même licence ou avec toute licence
-compatible ;
+compatible ;
 
 4. Les auteurs des originaux pourront, s'ils le souhaitent, vous autoriser
 à modifier l'original dans les mêmes conditions que les copies.
@@ -104,11 +101,12 @@ compatible ;
    3. DROITS CONNEXES.
 
 Les actes donnant lieu à des droits d'auteur ou des droits voisins ne doivent
-pas constituer un obstacle aux libertés conférées par cette licence. C'est
+pas constituer un obstacle aux libertés conférées par cette licence.
-pourquoi, par exemple, les interprétations doivent être soumises à la même
+
-licence ou une licence compatible. De même, l'intégration de l'œuvre à une
+C'est pourquoi, par exemple, les interprétations doivent être soumises à la
-base de données, une compilation ou une anthologie ne doit pas faire obstacle
+même licence ou une licence compatible. De même, l'intégration de l'œuvre
-à la jouissance de l'œuvre telle que définie par cette licence.
+à une base de données, une compilation ou une anthologie ne doit pas faire
+obstacle à la jouissance de l'œuvre telle que définie par cette licence.
 
    4. L' INTÉGRATION DE L'ŒUVRE.
 
@@ -121,16 +119,16 @@ compatible.
 
    5. CRITÈRES DE COMPATIBILITÉ.
 
-   Une licence est compatible avec la LAL si et seulement si :
+   Une licence est compatible avec la LAL si et seulement si :
 
 1. elle accorde l'autorisation de copier, diffuser et modifier des copies
 de l'œuvre, y compris à des fins lucratives, et sans autres restrictions que
-celles qu'impose le respect des autres critères de compatibilité ;
+celles qu'impose le respect des autres critères de compatibilité ;
 
 2. elle garantit la paternité de l'œuvre et l'accès aux versions antérieures
-de l'œuvre quand cet accès est possible ;
+de l'œuvre quand cet accès est possible ;
 
-      3. elle reconnaît la LAL également compatible (réciprocité) ;
+      3. elle reconnaît la LAL également compatible (réciprocité) ;
 
 4. elle impose que les modifications faites sur l'œuvre soient soumises à
 la même licence ou encore à une licence répondant aux critères de compatibilité

options/license/LGPL-2.0-only

@@ -1,8 +1,6 @@
 GNU LIBRARY GENERAL PUBLIC LICENSE
 
-Version 2, June 1991
+Version 2, June 1991 Copyright (C) 1991 Free Software Foundation, Inc.
-
-Copyright (C) 1991 Free Software Foundation, Inc.
 
 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
 

options/license/LGPL-2.0-or-later

@@ -1,8 +1,6 @@
 GNU LIBRARY GENERAL PUBLIC LICENSE
 
-Version 2, June 1991
+Version 2, June 1991 Copyright (C) 1991 Free Software Foundation, Inc.
-
-Copyright (C) 1991 Free Software Foundation, Inc.
 
 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
 

options/license/LGPL-3.0-only

@@ -2,7 +2,7 @@ GNU LESSER GENERAL PUBLIC LICENSE
 
 Version 3, 29 June 2007
 
-Copyright (C) 2007 Free Software Foundation, Inc. <http s ://fsf.org/>
+Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
 
 Everyone is permitted to copy and distribute verbatim copies of this license
 document, but changing it is not allowed.

options/license/LGPL-3.0-or-later

@@ -2,7 +2,7 @@ GNU LESSER GENERAL PUBLIC LICENSE
 
 Version 3, 29 June 2007
 
-Copyright (C) 2007 Free Software Foundation, Inc. <http s ://fsf.org/>
+Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
 
 Everyone is permitted to copy and distribute verbatim copies of this license
 document, but changing it is not allowed.

options/license/LPPL-1.0

@@ -1,8 +1,6 @@
 LaTeX Project Public License
 
-LPPL Version 1.0 1999-03-01
+LPPL Version 1.0 1999-03-01 Copyright 1999 LaTeX3 Project
-
-Copyright 1999 LaTeX3 Project
 
 Everyone is permitted to copy and distribute verbatim copies of this license
 document, but modification is not allowed.

options/license/LPPL-1.1

@@ -2,9 +2,7 @@ The LaTeX Project Public License
 
 =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
 
-LPPL Version 1.1 1999-07-10
+LPPL Version 1.1 1999-07-10 Copyright 1999 LaTeX3 Project
-
-Copyright 1999 LaTeX3 Project
 
 Everyone is allowed to distribute verbatim copies of this license document,
 but modification of it is not allowed.

options/license/LPPL-1.2

@@ -2,9 +2,7 @@ The LaTeX Project Public License
 
 =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
 
-LPPL Version 1.2 1999-09-03
+LPPL Version 1.2 1999-09-03 Copyright 1999 LaTeX3 Project
-
-Copyright 1999 LaTeX3 Project
 
 Everyone is allowed to distribute verbatim copies of this license document,
 but modification of it is not allowed.

options/license/LPPL-1.3a

@@ -2,9 +2,7 @@ The LaTeX Project Public License
 
 =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
 
-LPPL Version 1.3a 2004-10-01
+LPPL Version 1.3a 2004-10-01 Copyright 1999 2002-04 LaTeX3 Project
-
-Copyright 1999 2002-04 LaTeX3 Project
 
 Everyone is allowed to distribute verbatim copies of this license document,
 but modification of it is not allowed.

options/license/LPPL-1.3c

@@ -2,9 +2,7 @@ The LaTeX Project Public License
 
 =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
 
-LPPL Version 1.3c 2008-05-04
+LPPL Version 1.3c 2008-05-04 Copyright 1999 2002-2008 LaTeX3 Project
-
-Copyright 1999 2002-2008 LaTeX3 Project
 
 Everyone is allowed to distribute verbatim copies of this license document,
 but modification of it is not allowed.

options/license/MIT

@@ -1,6 +1,4 @@
-MIT License
+MIT License Copyright (c) <year> <copyright holders>
-
-Copyright (c) <year> <copyright holders>
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

options/license/MIT-CMU

@@ -1,22 +1,17 @@
-Copyright 1989, 1991, 1992 by Carnegie Mellon University
+<copyright notice> By obtaining, using, and/or copying this software and/or
+its associated documentation, you agree that you have read, understood, and
+will comply with the following terms and conditions:
 
-Derivative Work - 1996, 1998-2000 Copyright 1996, 1998-2000 The Regents of
+Permission to use, copy, modify, and distribute this software and its associated
-the University of California
+documentation for any purpose and without fee is hereby granted, provided
+that the above copyright notice appears in all copies, and that both that
+copyright notice and this permission notice appear in supporting documentation,
+and that the name of the copyright holder not be used in advertising or publicity
+pertaining to distribution of the software without specific, written permission.
 
-All Rights Reserved
+THE COPYRIGHT HOLDER DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-
+INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT
-Permission to use, copy, modify and distribute this software and its documentation
+SHALL THE COPYRIGHT HOLDER BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL
-for any purpose and without fee is hereby granted, provided that the above
+DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM THE LOSS OF USE, DATA OR
-copyright notice appears in all copies and that both that copyright notice
+PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
-and this permission notice appear in supporting documentation, and that the
+ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-name of CMU and The Regents of the University of California not be used in
-advertising or publicity pertaining to distribution of the software without
-specific written permission.
-
-CMU AND THE REGENTS OF THE UNIVERSITY OF CALIFORNIA DISCLAIM ALL WARRANTIES
-WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
-AND FITNESS. IN NO EVENT SHALL CMU OR THE REGENTS OF THE UNIVERSITY OF CALIFORNIA
-BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-WHATSOEVER RESULTING FROM THE LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR
-IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

options/license/MPL-1.0

@@ -319,7 +319,7 @@ of Covered Code you made available, the revenues you received from utilizing
 such rights, and other relevant factors. You agree to work with affected parties
 to distribute responsibility on an equitable basis. EXHIBIT A.
 
-" The contents of this file are subject to the Mozilla Public License Version
+"The contents of this file are subject to the Mozilla Public License Version
 1.0 (the "License"); you may not use this file except in compliance with the
 License. You may obtain a copy of the License at http://www.mozilla.org/MPL/
 
@@ -329,4 +329,4 @@ the specific language governing rights and limitations under the License.
 
 The Original Code is _____ . The Initial Developer of the Original Code is
 _____ . Portions created by _____ are Copyright (C) _____ . All Rights Reserved.
-Contributor(s): _____ . "
+Contributor(s): _____ ."

options/license/MPL-1.1

@@ -389,7 +389,7 @@ portions of the Covered Code under Your choice of the MPL or the alternative
 licenses, if any, specified by the Initial Developer in the file described
 in Exhibit A. Exhibit A - Mozilla Public License.
 
-" The contents of this file are subject to the Mozilla Public License Version
+"The contents of this file are subject to the Mozilla Public License Version
 1.1 (the "License"); you may not use this file except in compliance with the
 License. You may obtain a copy of the License at http://www.mozilla.org/MPL/
 
@@ -414,7 +414,7 @@ to allow others to use your version of this file under the MPL, indicate your
 decision by deleting the provisions above and replace them with the notice
 and other provisions required by the [___] License. If you do not delete the
 provisions above, a recipient may use your version of this file under either
-the MPL or the [___] License. "
+the MPL or the [___] License."
 
 NOTE: The text of this Exhibit A may differ slightly from the text of the
 notices in the Source Code files of the Original Code. You should use the

options/license/MTLL

@@ -1,6 +1,4 @@
-Software License for MTL
+Software License for MTL Copyright (c) 2007 The Trustees of Indiana University.
-
-Copyright (c) 2007 The Trustees of Indiana University.
 
 2008 Dresden University of Technology and the Trustees of Indiana University.
 

options/license/MakeIndex

@@ -1,8 +1,6 @@
 MakeIndex Distribution Notice
 
-11/11/1989
+11/11/1989 Copyright (C) 1989 by Chen & Harrison International Systems, Inc.
-
-Copyright (C) 1989 by Chen & Harrison International Systems, Inc.
 
 Copyright (C) 1988 by Olivetti Research Center
 

options/license/MirOS

@@ -1,8 +1,4 @@
-MirOS License
+The MirOS Licence Copyright [YEAR] [NAME] [EMAIL]
-
-Copyright [YEAR]
-
-[NAME] [EMAIL]
 
 Provided that these terms and disclaimer and all copyright notices are retained
 or reproduced in an accompanying document, permission is granted to deal in
@@ -15,50 +11,4 @@ intent or gross negligence. In no event may a licensor, author or contributor
 be held liable for indirect, direct, other damage, loss, or other issues arising
 in any way out of dealing in the work, even if advised of the possibility
 of such damage or existence of a defect, except proven that it results out
-of said person's immediate fault when using the work as intended. I_N_S_T_R_U_C_T_I_O_N_S_:_
+of said person's immediate fault when using the work as intended.
-
-To apply the template(1) specify the years of copyright (separated by comma,
-not as a range), the legal names of the copyright holders, and the real names
-of the authors if different. Avoid adding text.
-
-R_A_T_I_O_N_A_L_E_:_
-
-This licence is apt for any kind of work (such as source code, fonts, documentation,
-graphics, sound etc.) and the preferred terms for work added to MirBSD. It
-has been drafted as universally usable equivalent of the "historic permission
-notice"(2) adapted to Europen law because in some (droit d'auteur) countries
-authors cannot disclaim all liabi‐ lities. Compliance to DFSG(3) 1.1 is ensured,
-and GPLv2 compatibility is asserted unless advertising clauses are used. The
-MirOS Licence is certified to conform to OKD(4) 1.0 and OSD(5) 1.9, and qualifies
-as a Free Software(6) and also Free Documentation(7) licence and is included
-in some relevant lists(8)(9)(10).
-
-We believe you are not liable for work inserted which is intellectual property
-of third parties, if you were not aware of the fact, act appropriately as
-soon as you become aware of that problem, seek an amicable solution for all
-parties, and never knowingly distribute a work without being authorised to
-do so by its licensors.
-
-R_E_F_E_R_E_N_C_E_S_:_
-
-
-
-   (1) also at http://mirbsd.de/MirOS-Licence
-
-   (2) http://www.opensource.org/licenses/historical.php
-
-   (3) http://www.debian.org/social_contract#guidelines
-
-   (4) http://www.opendefinition.org/1.0
-
-   (5) http://www.opensource.org/docs/osd
-
-   (6) http://www.gnu.org/philosophy/free-sw.html
-
-   (7) http://www.gnu.org/philosophy/free-doc.html
-
-   (8) http://www.ifross.de/ifross_html/lizenzcenter.html
-
-   (9) http://www.opendefinition.org/licenses
-
-   (10) http://opensource.org/licenses/miros.html

options/license/Multics

@@ -23,10 +23,9 @@ copyright notice and historical background appear in all copies and that both
 the copyright notice and historical background and this permission notice
 appear in supporting documentation, and that the names of MIT, HIS, BULL or
 BULL HN not be used in advertising or publicity pertaining to distribution
-of the programs without specific prior written permission.
+of the programs without specific prior written permission. Copyright 1972
-
+by Massachusetts Institute of Technology and Honeywell Information Systems
-Copyright 1972 by Massachusetts Institute of Technology and Honeywell Information
+Inc.
-Systems Inc.
 
 Copyright 2006 by BULL HN Information Systems Inc.
 

options/license/NBPL-1.0

@@ -1,9 +1,8 @@
-The Net Boolean Public License
+The Net Boolean Public License Version 1, 22 August 1998 Copyright 1998, Net
-
+Boolean Incorporated, Redwood City, California, USA All Rights Reserved. Note:
-Version 1, 22 August 1998 Copyright 1998, Net Boolean Incorporated, Redwood
+This license is derived from the "Artistic License" as distributed with the
-City, California, USA All Rights Reserved. Note: This license is derived from
+Perl Programming Language. Its terms are different from those of the "Artistic
-the "Artistic License" as distributed with the Perl Programming Language.
+License."
-Its terms are different from those of the "Artistic License."
 
 PREAMBLE
 

options/license/NCSA

@@ -1,6 +1,5 @@
-University of Illinois/NCSA Open Source License
+University of Illinois/NCSA Open Source License Copyright (c) <Year> <Owner
-
+Organization Name>. All rights reserved.
-Copyright (c) <Year> <Owner Organization Name> . All rights reserved.
 
 Developed by: 
 

options/license/NGPL

@@ -1,6 +1,4 @@
-NETHACK GENERAL PUBLIC LICENSE
+NETHACK GENERAL PUBLIC LICENSE (Copyright 1989 M. Stephenson)
-
-(Copyright 1989 M. Stephenson)
 
 (Based on the BISON general public license, copyright 1988 Richard M. Stallman)
 

options/license/NTP

@@ -1,6 +1,5 @@
-NTP License (NTP)
+NTP License (NTP) Copyright (c) (CopyrightHoldersName) (From 4-digit-year)-(To
-
+4-digit-year)
-Copyright (c) (CopyrightHoldersName) (From 4-digit-year)-(To 4-digit-year)
 
 Permission to use, copy, modify, and distribute this software and its documentation
 for any purpose with or without fee is hereby granted, provided that the above

options/license/Naumen

@@ -1,6 +1,5 @@
-NAUMEN Public License
+NAUMEN Public License This software is Copyright (c) NAUMEN (tm) and Contributors.
-
+All rights reserved.
-This software is Copyright (c) NAUMEN (tm) and Contributors. All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,
 are permitted provided that the following conditions are met:

options/license/Net-SNMP

@@ -1,6 +1,5 @@
----- Part 1: CMU/UCD copyright notice: (BSD like) -----
+---- Part 1: CMU/UCD copyright notice: (BSD like) ----- Copyright 1989, 1991,
-
+1992 by Carnegie Mellon University
-Copyright 1989, 1991, 1992 by Carnegie Mellon University
 
 Derivative Work - 1996, 1998-2000 Copyright 1996, 1998-2000 The Regents of
 the University of California
@@ -79,10 +78,9 @@ IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGE.
 
----- Part 4: Sun Microsystems, Inc. copyright notice (BSD) -----
+---- Part 4: Sun Microsystems, Inc. copyright notice (BSD) ----- Copyright
-
+© 2003 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, California
-Copyright © 2003 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+95054, U.S.A. All rights reserved.
-California 95054, U.S.A. All rights reserved.
 
 Use is subject to license terms below.
 
@@ -174,7 +172,6 @@ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
 USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 ---- Part 7: Fabasoft R&D Software GmbH & Co KG copyright notice (BSD) -----
-
 Copyright (c) Fabasoft R&D Software GmbH & Co KG, 2003 oss@fabasoft.com Author:
 Bernhard Penz
 
@@ -203,9 +200,8 @@ IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGE.
 
----- Part 8: Apple Inc. copyright notice (BSD) -----
+---- Part 8: Apple Inc. copyright notice (BSD) ----- Copyright (c) 2007 Apple
-
+Inc. All rights reserved.
-Copyright (c) 2007 Apple Inc. All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,
 are permitted provided that the following conditions are met:

options/license/OCLC-2.0

@@ -2,9 +2,8 @@ OCLC Research Public License 2.0
 
 Terms & Conditions Of Use
 
-May, 2002
+May, 2002 Copyright © 2002. OCLC Online Computer Library Center, Inc. All
-
+Rights Reserved
-Copyright © 2002. OCLC Online Computer Library Center, Inc. All Rights Reserved
 
 PLEASE READ THIS DOCUMENT CAREFULLY. BY DOWNLOADING OR USING THE CODE BASE
 AND/OR DOCUMENTATION ACCOMPANYING THIS LICENSE (THE "License"), YOU AGREE
@@ -79,7 +78,7 @@ If you distribute the Program in a form to which the recipient can make Modifica
 addition, each source and data file of the Program and any Modification you
 distribute must contain the following notice:
 
-" Copyright (c) 2000- (insert then current year) OCLC Online Computer Library
+"Copyright (c) 2000- (insert then current year) OCLC Online Computer Library
 Center, Inc. and other contributors . All rights reserved. The contents of
 this file, as updated from time to time by the OCLC Office of Research, are
 subject to OCLC Research Public License Version 2.0 (the "License"); you may
@@ -93,7 +92,7 @@ OCLC Research. For more information on OCLC Research, please see http://www.oclc
 The Original Code is ______________________________ . The Initial Developer
 of the Original Code is ________________________ . Portions created by ______________________
 are Copyright (C) ____________________________ . All Rights Reserved. Contributor(s):
-______________________________________ . "
+______________________________________ ."
 
    C. Requirements for a Distribution of Non-modifiable Code
 

options/license/OLDAP-1.1

@@ -1,10 +1,9 @@
 The OpenLDAP Public License
 
-Version 1.1, 25 August 1998
+Version 1.1, 25 August 1998 Copyright 1998, The OpenLDAP Foundation. All Rights
-
+Reserved. Note: This license is derived from the "Artistic License" as distributed
-Copyright 1998, The OpenLDAP Foundation. All Rights Reserved. Note: This license
+with the Perl Programming Language. Its terms are different from those of
-is derived from the "Artistic License" as distributed with the Perl Programming
+the "Artistic License."
-Language. Its terms are different from those of the "Artistic License."
 
 PREAMBLE
 

options/license/OLDAP-1.2

@@ -1,10 +1,9 @@
 The OpenLDAP Public License
 
-Version 1.2, 1 September 1998
+Version 1.2, 1 September 1998 Copyright 1998, The OpenLDAP Foundation. All
-
+Rights Reserved. Note: This license is derived from the "Artistic License"
-Copyright 1998, The OpenLDAP Foundation. All Rights Reserved. Note: This license
+as distributed with the Perl Programming Language. As differences may exist,
-is derived from the "Artistic License" as distributed with the Perl Programming
+the complete license should be read.
-Language. As differences may exist, the complete license should be read.
 
 PREAMBLE
 

options/license/OLDAP-1.3

@@ -1,11 +1,9 @@
 The OpenLDAP Public License
 
-Version 1.3, 17 January 1999
+Version 1.3, 17 January 1999 Copyright 1998-1999, The OpenLDAP Foundation.
-
+All Rights Reserved. Note: This license is derived from the "Artistic License"
-Copyright 1998-1999, The OpenLDAP Foundation. All Rights Reserved. Note: This
+as distributed with the Perl Programming Language. As significant differences
-license is derived from the "Artistic License" as distributed with the Perl
+exist, the complete license should be read.
-Programming Language. As significant differences exist, the complete license
-should be read.
 
 PREAMBLE
 

options/license/OLDAP-1.4

@@ -1,11 +1,9 @@
 The OpenLDAP Public License
 
-Version 1.4, 18 January 1999
+Version 1.4, 18 January 1999 Copyright 1998-1999, The OpenLDAP Foundation.
-
+All Rights Reserved. Note: This license is derived from the "Artistic License"
-Copyright 1998-1999, The OpenLDAP Foundation. All Rights Reserved. Note: This
+as distributed with the Perl Programming Language. As significant differences
-license is derived from the "Artistic License" as distributed with the Perl
+exist, the complete license should be read.
-Programming Language. As significant differences exist, the complete license
-should be read.
 
 PREAMBLE
 

options/license/OLDAP-2.0

@@ -1,9 +1,7 @@
 The OpenLDAP Public License
 
-Version 2.0, 7 June 1999
+Version 2.0, 7 June 1999 Copyright 1999, The OpenLDAP Foundation, Redwood
-
+City, California, USA. All Rights Reserved.
-Copyright 1999, The OpenLDAP Foundation, Redwood City, California, USA. All
-Rights Reserved.
 
 Redistribution and use of this software and associated documentation ("Software"),
 with or without modification, are permitted provided that the following conditions

options/license/OLDAP-2.0.1

@@ -1,9 +1,7 @@
 The OpenLDAP Public License
 
-Version 2.0.1, 21 December 1999
+Version 2.0.1, 21 December 1999 Copyright 1999, The OpenLDAP Foundation, Redwood
-
+City, California, USA. All Rights Reserved.
-Copyright 1999, The OpenLDAP Foundation, Redwood City, California, USA. All
-Rights Reserved.
 
 Redistribution and use of this software and associated documentation ("Software"),
 with or without modification, are permitted provided that the following conditions

options/license/OLDAP-2.1

@@ -1,9 +1,7 @@
 The OpenLDAP Public License
 
-Version 2.1, 29 February 2000
+Version 2.1, 29 February 2000 Copyright 1999-2000, The OpenLDAP Foundation,
-
+Redwood City, California, USA. All Rights Reserved.
-Copyright 1999-2000, The OpenLDAP Foundation, Redwood City, California, USA.
-All Rights Reserved.
 
 Redistribution and use of this software and associated documentation ("Software"),
 with or without modification, are permitted provided that the following conditions

options/license/OSET-PL-2.1

@@ -1,9 +1,7 @@
-OSET Public License
+OSET Public License (c) 2015 ALL RIGHTS RESERVED VERSION 2.1 THIS LICENSE
-
+DEFINES THE RIGHTS OF USE, REPRODUCTION, DISTRIBUTION, MODIFICATION, AND REDISTRIBUTION
-(c) 2015 ALL RIGHTS RESERVED VERSION 2.1 THIS LICENSE DEFINES THE RIGHTS OF
+OF CERTAIN COVERED SOFTWARE (AS DEFINED BELOW) ORIGINALLY RELEASED BY THE
-USE, REPRODUCTION, DISTRIBUTION, MODIFICATION, AND REDISTRIBUTION OF CERTAIN
+OPEN SOURCE ELECTION TECHNOLOGY FOUNDATION (FORMERLY "THE OSDV FOUNDATION").
-COVERED SOFTWARE (AS DEFINED BELOW) ORIGINALLY RELEASED BY THE OPEN SOURCE
-ELECTION TECHNOLOGY FOUNDATION (FORMERLY "THE OSDV FOUNDATION").
 
 ANYONE WHO USES, REPRODUCES, DISTRIBUTES, MODIFIES, OR REDISTRIBUTES THE COVERED
 SOFTWARE, OR ANY PART THEREOF, IS BY THAT ACTION, ACCEPTING IN FULL THE TERMS

options/license/OSL-1.0

@@ -5,7 +5,7 @@ authorship (the "Original Work") whose owner (the "Licensor") has placed the
 following notice immediately following the copyright notice for the Original
 Work:
 
-" Licensed under the Open Software License version 1.0 "
+"Licensed under the Open Software License version 1.0"
 
 License Terms
 

options/license/OpenSSL

@@ -1,6 +1,4 @@
-OpenSSL License
+OpenSSL License Copyright (c) 1998-2008 The OpenSSL Project. All rights reserved.
-
-Copyright (c) 1998-2008 The OpenSSL Project. All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,
 are permitted provided that the following conditions are met:
@@ -41,9 +39,7 @@ ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 This product includes cryptographic software written by Eric Young (eay@cryptsoft.com).
 This product includes software written by Tim Hudson (tjh@cryptsoft.com).
-Original SSLeay License
+Original SSLeay License Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
-
-Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
 
 All rights reserved.
 

options/license/PHP-3.0

@@ -1,6 +1,5 @@
-The PHP License, version 3.0
+The PHP License, version 3.0 Copyright (c) 1999 - 2006 The PHP Group. All
-
+rights reserved.
-Copyright (c) 1999 - 2006 The PHP Group. All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,
 is permitted provided that the following conditions are met:

options/license/PHP-3.01

@@ -1,6 +1,5 @@
-The PHP License, version 3.01
+The PHP License, version 3.01 Copyright (c) 1999 - 2012 The PHP Group. All
-
+rights reserved.
-Copyright (c) 1999 - 2012 The PHP Group. All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,
 is permitted provided that the following conditions are met:

options/license/Plexus

@@ -1,4 +1,4 @@
-Copyright 2002 (C) The Codehaus . All Rights Reserved.
+Copyright 2002 (C) The Codehaus. All Rights Reserved.
 
 Redistribution and use of this software and associated documentation ("Software"),
 with or without modification, are permitted provided that the following conditions

options/license/PostgreSQL

@@ -1,8 +1,7 @@
 PostgreSQL Database Management System
 
-(formerly known as Postgres, then as Postgres95)
+(formerly known as Postgres, then as Postgres95) Portions Copyright (c) 1996-2010,
-
+The PostgreSQL Global Development Group
-Portions Copyright (c) 1996-2010, The PostgreSQL Global Development Group
 
 Portions Copyright (c) 1994, The Regents of the University of California
 

options/license/Python-2.0

@@ -140,10 +140,8 @@ or any third party.
 8. By clicking on the "ACCEPT" button where indicated, or by copying, installing
 or otherwise using Python 1.6b1, Licensee agrees to be bound by the terms
 and conditions of this License Agreement. ACCEPT CWI LICENSE AGREEMENT FOR
-PYTHON 0.9.0 THROUGH 1.2
+PYTHON 0.9.0 THROUGH 1.2 Copyright (c) 1991 - 1995, Stichting Mathematisch
-
+Centrum Amsterdam, The Netherlands. All rights reserved.
-Copyright (c) 1991 - 1995, Stichting Mathematisch Centrum Amsterdam, The Netherlands.
-All rights reserved.
 
 Permission to use, copy, modify, and distribute this software and its documentation
 for any purpose and without fee is hereby granted, provided that the above

options/license/QPL-1.0

@@ -1,6 +1,4 @@
-THE Q PUBLIC LICENSE version 1.0
+THE Q PUBLIC LICENSE version 1.0 Copyright (C) 1999-2005 Trolltech AS, Norway.
-
-Copyright (C) 1999-2005 Trolltech AS, Norway.
 
 Everyone is permitted to copy and distribute this license document.
 

options/license/RPL-1.1

@@ -1,6 +1,5 @@
-Reciprocal Public License, version 1.1
+Reciprocal Public License, version 1.1 Copyright (C) 2001-2002 Technical Pursuit
-
+Inc., All Rights Reserved. PREAMBLE
-Copyright (C) 2001-2002 Technical Pursuit Inc., All Rights Reserved. PREAMBLE
 
 This Preamble is intended to describe, in plain English, the nature, intent,
 and scope of this License. However, this Preamble is not a part of this License.

options/license/RPSL-1.0

@@ -416,7 +416,7 @@ and all related documents be drafted in English. Les parties ont exigé que
 le présent contrat et tous les documents connexes soient rédigés en anglais.
 EXHIBIT A.
 
-" Copyright (c) 1995-2002 RealNetworks, Inc. and/or its licensors. All Rights
+"Copyright (c) 1995-2002 RealNetworks, Inc. and/or its licensors. All Rights
 Reserved.
 
 The contents of this file, and the files included with this file, are subject
@@ -442,7 +442,7 @@ PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
 Contributor(s): ____________________________________
 
 Technology Compatibility Kit Test Suite(s) Location (if licensed under the
-RCSL): _____ "
+RCSL): _____"
 
 Object Code Notice: Helix DNA Client technology included. Copyright (c) RealNetworks,
 Inc., 1995-2002. All rights reserved.

options/license/RSCPL

@@ -301,13 +301,13 @@ NEGLIGENCE TO THE EXTENT APPLICABLE LAW PROHIBITS SUCH LIMITATION. SOME JURISDIC
 DO NOT ALLOW THE EXCLUSION OR LIMITATION OF INCIDENTAL OR CONSEQUENTIAL DAMAGES,
 SO THAT EXCLUSION AND LIMITATION MAY NOT APPLY TO YOU. TO THE EXTENT THAT
 ANY EXCLUSION OF DAMAGES ABOVE IS NOT VALID, YOU AGREE THAT IN NO EVENT WILL
-RSV ' S LIABILITY UNDER OR RELATED TO THIS AGREEMENT EXCEED FIVE THOUSAND
+RSV'S LIABILITY UNDER OR RELATED TO THIS AGREEMENT EXCEED FIVE THOUSAND DOLLARS
-DOLLARS ($5,000). THE GOVERNED CODE IS NOT INTENDED FOR USE IN CONNECTION
+($5,000). THE GOVERNED CODE IS NOT INTENDED FOR USE IN CONNECTION WITH ANY
-WITH ANY NUCLER, AVIATION, MASS TRANSIT OR MEDICAL APPLICATION OR ANY OTHER
+NUCLER, AVIATION, MASS TRANSIT OR MEDICAL APPLICATION OR ANY OTHER INHERENTLY
-INHERENTLY DANGEROUS APPLICATION THAT COULD RESULT IN DEATH, PERSONAL INJURY,
+DANGEROUS APPLICATION THAT COULD RESULT IN DEATH, PERSONAL INJURY, CATASTROPHIC
-CATASTROPHIC DAMAGE OR MASS DESTRUCTION, AND YOU AGREE THAT NEITHER RSV NOR
+DAMAGE OR MASS DESTRUCTION, AND YOU AGREE THAT NEITHER RSV NOR ANY CONTRIBUTOR
-ANY CONTRIBUTOR SHALL HAVE ANY LIABILITY OF ANY NATURE AS A RESULT OF ANY
+SHALL HAVE ANY LIABILITY OF ANY NATURE AS A RESULT OF ANY SUCH USE OF THE
-SUCH USE OF THE GOVERNED CODE.
+GOVERNED CODE.
 
    10. U.S. Government End Users.
 
@@ -330,7 +330,7 @@ further agree that any cause of action arising under or related to this Agreemen
 shall be brought in the Federal Courts of the Northern District of California,
 with venue lying in Santa Clara County, California. The losing party shall
 be responsible for costs, including without limitation, court costs and reasonable
-attorney ' s fees and expenses. Notwithstanding anything to the contrary herein,
+attorney's fees and expenses. Notwithstanding anything to the contrary herein,
 RSV may seek injunctive relief related to a breach of this Agreement in any
 court of competent jurisdiction. The application of the United Nations Convention
 on Contracts for the International Sale of Goods is expressly excluded. Any

options/license/SGI-B-1.0

@@ -222,11 +222,10 @@ INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND CONDITIONS OF MERCHANT
 SATISFACTORY QUALITY, FITNESS FOR A PARTICULAR PURPOSE, AND NON-INFRINGEMENT.
 
 Original Code. The Original Code is: [ name of software , version number ,
-and release date ] , developed by Silicon Graphics, Inc. The Original Code
+and release date], developed by Silicon Graphics, Inc. The Original Code is
-is Copyright (c) [ dates of first publication, as appearing in the Notice
+Copyright (c) [ dates of first publication, as appearing in the Notice in
-in the Original Code ] Silicon Graphics, Inc. Copyright in any portions created
+the Original Code] Silicon Graphics, Inc. Copyright in any portions created
 by third parties is as indicated elsewhere herein. All Rights Reserved.
 
 Additional Notice Provisions: [ such additional provisions, if any, as appear
-in the Notice in the Original Code under the heading "Additional Notice Provisions"
+in the Notice in the Original Code under the heading "Additional Notice Provisions"]
-]

options/license/SGI-B-1.1

@@ -238,10 +238,9 @@ INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND CONDITIONS OF MERCHANT
 SATISFACTORY QUALITY, FITNESS FOR A PARTICULAR PURPOSE, AND NON-INFRINGEMENT.
 
 Original Code. The Original Code is: [ name of software , version number ,
-and release date ] , developed by Silicon Graphics, Inc. The Original Code
+and release date] , developed by Silicon Graphics, Inc. The Original Code
 is Copyright (c) [ dates of first publication, as appearing in the Notice
-in the Original Code ] Silicon Graphics, Inc. Copyright in any portions created
+in the Original Code] Silicon Graphics, Inc. Copyright in any portions created
 by third parties is as indicated elsewhere herein. All Rights Reserved. Additional
 Notice Provisions: [ such additional provisions, if any, as appear in the
-Notice in the Original Code under the heading "Additional Notice Provisions"
+Notice in the Original Code under the heading "Additional Notice Provisions"]
-]

options/license/SGI-B-2.0

@@ -1,9 +1,7 @@
 SGI FREE SOFTWARE LICENSE B
 
-(Version 2.0, Sept. 18, 2008)
+(Version 2.0, Sept. 18, 2008) Copyright (C) [dates of first publication] Silicon
-
+Graphics, Inc. All Rights Reserved.
-Copyright (C) [dates of first publication] Silicon Graphics, Inc. All Rights
-Reserved.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

options/license/SISSL

@@ -238,7 +238,7 @@ law or regulation which provides that the language of a contract shall be
 construed against the drafter shall not apply to this License. EXHIBIT A -
 Sun Standards License
 
-" The contents of this file are subject to the Sun Standards License Version
+"The contents of this file are subject to the Sun Standards License Version
 1.1 (the "License"); You may not use this file except in compliance with the
 License. You may obtain a copy of the License at _______________________________
 .

options/license/SISSL-1.2

@@ -202,32 +202,31 @@ which have been validly granted by You or any distributor hereunder prior
 to termination shall survive termination. EXHIBIT A - Sun Industry Standards
 Source License
 
-" The contents of this file are subject to the Sun Industry Standards Source
+"The contents of this file are subject to the Sun Industry Standards Source
 License Version 1.2 (the License); You
 
-may not use this file except in compliance with the License. "
+may not use this file except in compliance with the License."
 
-" You may obtain a copy of the License at gridengine.sunsource.net/license.html
+"You may obtain a copy of the License at gridengine.sunsource.net/license.html"
-"
 
-" Software distributed under the License is distributed on an AS IS basis,
+"Software distributed under the License is distributed on an AS IS basis,
 WITHOUT WARRANTY OF ANY KIND, either express or
 
 implied. See the License for the specific language governing rights and limitations
-under the License. "
+under the License."
 
-" The Original Code is Grid Engine. "
+"The Original Code is Grid Engine."
 
-" The Initial Developer of the Original Code is:
+"The Initial Developer of the Original Code is:
 
-Sun Microsystems, Inc. "
+Sun Microsystems, Inc."
 
-" Portions created by: Sun Microsystems, Inc. are Copyright (C) 2001 Sun Microsystems,
+"Portions created by: Sun Microsystems, Inc. are Copyright (C) 2001 Sun Microsystems,
-Inc. "
+Inc."
 
-" All Rights Reserved. "
+"All Rights Reserved."
 
-" Contributor(s): __________________________________"
+"Contributor(s): __________________________________"
 
 EXHIBIT B - Standards
 

options/license/SMLNJ

@@ -1,6 +1,5 @@
-STANDARD ML OF NEW JERSEY COPYRIGHT NOTICE, LICENSE AND DISCLAIMER.
+STANDARD ML OF NEW JERSEY COPYRIGHT NOTICE, LICENSE AND DISCLAIMER. Copyright
-
+(c) 2001-2011 by The Fellowship of SML/NJ
-Copyright (c) 2001-2011 by The Fellowship of SML/NJ
 
 Copyright (c) 1989-2001 by Lucent Technologies
 

options/license/SMPPL

@@ -58,6 +58,5 @@ The SMP uses the Enhanced SNACC (eSNACC) Abstract Syntax Notation One (ASN.1)
 C++ Library to ASN.1 encode and decode security-related data objects. The
 eSNACC ASN.1 C++ Library is covered by the ENHANCED SNACC SOFTWARE PUBLIC
 LICENSE. None of the GNU public licenses apply to the eSNACC ASN.1 C++ Library.
-The eSNACC Compiler is not distributed as part of the SMP.
+The eSNACC Compiler is not distributed as part of the SMP. Copyright © 1997-2002
-
+National Security Agency
-Copyright © 1997-2002 National Security Agency