Skip to content

Commit

Permalink
Update some url
Browse files Browse the repository at this point in the history
  • Loading branch information
xuwei-k committed Oct 31, 2021
1 parent 4440d3b commit b24ae55
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 7 deletions.
4 changes: 2 additions & 2 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ This is the process for committing code into main. There are of course exception
2. The ticket has been scheduled for the current milestone.
3. The ticket is estimated by the team.
4. The ticket have been discussed and prioritized by the team.
3. You should always perform your work in a Git feature branch. The branch should be given a descriptive name that explains its intent. Some teams also like adding the ticket number and/or the [GitHub](http://github.com) user ID to the branch name, these details is up to each of the individual teams.
3. You should always perform your work in a Git feature branch. The branch should be given a descriptive name that explains its intent. Some teams also like adding the ticket number and/or the [GitHub](https://github.com) user ID to the branch name, these details is up to each of the individual teams.
4. When the feature or fix is completed you should open a [Pull Request](https://help.github.com/articles/using-pull-requests) on GitHub.
5. The Pull Request should be reviewed by other maintainers (as many as feasible/practical). Note that the maintainers can consist of outside contributors, both within and outside Typesafe. Outside contributors (for example from EPFL or independent committers) are encouraged to participate in the review process, it is not a closed process.
6. After the review you should fix the issues as needed (pushing a new commit for new review etc.), iterating until the reviewers give their thumbs up.
Expand Down Expand Up @@ -87,7 +87,7 @@ Also, to facilitate both well-formed commits and working together, the ``wip`` a

Follow these guidelines when creating public commits and writing commit messages.

1. If your work spans multiple local commits (for example; if you do safe point commits while working in a feature branch or work in a branch for long time doing merges/rebases etc.) then please do not commit it all but rewrite the history by squashing the commits into a single big commit which you write a good commit message for (like discussed in the following sections). For more info read this article: [Git Workflow](http://sandofsky.com/blog/git-workflow.html). Every commit should be able to be used in isolation, cherry picked etc.
1. If your work spans multiple local commits (for example; if you do safe point commits while working in a feature branch or work in a branch for long time doing merges/rebases etc.) then please do not commit it all but rewrite the history by squashing the commits into a single big commit which you write a good commit message for (like discussed in the following sections). For more info read this article: [Git Workflow](https://sandofsky.com/workflow/git-workflow/). Every commit should be able to be used in isolation, cherry picked etc.
2. First line should be a descriptive sentence what the commit is doing. It should be possible to fully understand what the commit does by just reading this single line. It is **not ok** to only list the ticket number, type "minor fix" or similar. Include reference to ticket number, prefixed with #, at the end of the first line. If the commit is a small fix, then you are done. If not, go to 3.
3. Following the single line description should be a blank line followed by an enumerated list with the details of the commit.
4. Add keywords for your commit (depending on the degree of automation we reach, the list may change over time):
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ The first stand-alone version of Twirl was created by the [Spray team][spray].
An optimized version of the Twirl parser was contributed by the
[Scala IDE team][scala-ide].

[play-site]: http://www.playframework.com
[docs]: http://www.playframework.com/documentation/latest/ScalaTemplates
[play-site]: https://www.playframework.com
[docs]: https://www.playframework.com/documentation/latest/ScalaTemplates
[spray]: https://github.com/spray
[scala-ide]: https://github.com/scala-ide
2 changes: 1 addition & 1 deletion api/shared/src/main/scala/play/twirl/api/package.scala
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ package object api {

/**
* Brings the template engine as a
* [[http://docs.scala-lang.org/overviews/core/string-interpolation.html string interpolator]].
* [[https://docs.scala-lang.org/overviews/core/string-interpolation.html string interpolator]].
*
* Basic usage:
*
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@ For example to output raw HTML:

## String interpolation

The template engine can be used as a [string interpolator](http://docs.scala-lang.org/overviews/core/string-interpolation.html). You basically trade the “@” for a “$”:
The template engine can be used as a [string interpolator](https://docs.scala-lang.org/overviews/core/string-interpolation.html). You basically trade the “@” for a “$”:

@[string-interpolation](code/ScalaTemplates.scala)

Expand Down
2 changes: 1 addition & 1 deletion parser/src/main/scala/play/twirl/parser/TwirlParser.scala
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import scala.util.parsing.input.OffsetPosition

/**
* TwirlParser is a recursive descent parser for a modified grammar of the Play2 template language as loosely defined
* [[http://www.playframework.com/documentation/latest/Home here]] and more rigorously defined by the original template
* [[https://www.playframework.com/documentation/latest/Home here]] and more rigorously defined by the original template
* parser, `play.templates.ScalaTemplateCompiler.TemplateParser`. TwirlParser is meant to be a near drop in replacement
* for `play.templates.ScalaTemplateCompiler.TemplateParser`.
*
Expand Down

0 comments on commit b24ae55

Please sign in to comment.