summaryrefslogtreecommitdiff
path: root/spec
diff options
context:
space:
mode:
authorAdriaan Moors <adriaan@lightbend.com>2016-09-29 16:04:27 -0700
committerGitHub <noreply@github.com>2016-09-29 16:04:27 -0700
commit40872a5254e4b4ef56b6d7aa37dda4e85d1bd1ba (patch)
treeca48ca8c09d56338380875d20d03062a53d1d969 /spec
parent1615ce9eb406c6c9de608900a3338ac715caabc6 (diff)
parentda660071143de9ec763b47a9c67c0623b4b4edc6 (diff)
downloadscala-40872a5254e4b4ef56b6d7aa37dda4e85d1bd1ba.tar.gz
scala-40872a5254e4b4ef56b6d7aa37dda4e85d1bd1ba.tar.bz2
scala-40872a5254e4b4ef56b6d7aa37dda4e85d1bd1ba.zip
Merge pull request #5437 from SethTisue/spec-2.12
make the 2.12 spec available on scala-lang.org
Diffstat (limited to 'spec')
-rw-r--r--spec/README.md2
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/README.md b/spec/README.md
index 1a201fc97c..9fd7c9f6ae 100644
--- a/spec/README.md
+++ b/spec/README.md
@@ -12,7 +12,7 @@ We use Jekyll 2 and [Redcarpet](https://github.com/vmg/redcarpet) to generate th
## Building
-Travis CI builds the spec automatically on every commit to master and publishes to http://www.scala-lang.org/files/archive/spec/2.11/.
+Travis CI builds the spec automatically after every merged pull release and publishes to http://www.scala-lang.org/files/archive/spec/2.12/.
To preview locally, run `bundle exec jekyll serve -d build/spec/ -s spec/ -w --baseurl=""` (in the root of your checkout of scala/scala),
and open http://0.0.0.0:4000/. Jekyll will rebuild as you edit the markdown, but make sure to restart it when you change `_config.yml`.