From 616dc092d54a933092ea9e6167c48159e3a5a147 Mon Sep 17 00:00:00 2001 From: "e.e d3si9n" Date: Wed, 28 Mar 2012 16:17:45 -0400 Subject: [PATCH 1/4] removed CNAME for preview --- CNAME | 1 - 1 file changed, 1 deletion(-) delete mode 100644 CNAME diff --git a/CNAME b/CNAME deleted file mode 100644 index 4c54828903..0000000000 --- a/CNAME +++ /dev/null @@ -1 +0,0 @@ -docs.scala-lang.org \ No newline at end of file From 773b43699fcf3e5b3031f205da3f98e413e5ff28 Mon Sep 17 00:00:00 2001 From: "e.e d3si9n" Date: Wed, 28 Mar 2012 16:35:28 -0400 Subject: [PATCH 2/4] baseurl --- _config.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/_config.yml b/_config.yml index 02be603ea8..3268d8f881 100644 --- a/_config.yml +++ b/_config.yml @@ -16,4 +16,6 @@ scala-version: 2.10.0 pygments: true permalink: /:categories/:title.html -# markdown: rdiscount \ No newline at end of file +# markdown: rdiscount +baseurl: http://scalajp.github.com/scala.github.com + From 332cc4c41139bba56e6e96cbd40e8cd3b5033580 Mon Sep 17 00:00:00 2001 From: Eugene Yokota Date: Fri, 13 Sep 2013 14:59:02 -0400 Subject: [PATCH 3/4] Collections Translation: Restore breaking pages --- ja/overviews/collections/{seqs.md.disabled => seqs.md} | 2 +- ja/overviews/collections/{sets.md.disabled => sets.md} | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) rename ja/overviews/collections/{seqs.md.disabled => seqs.md} (99%) rename ja/overviews/collections/{sets.md.disabled => sets.md} (97%) diff --git a/ja/overviews/collections/seqs.md.disabled b/ja/overviews/collections/seqs.md similarity index 99% rename from ja/overviews/collections/seqs.md.disabled rename to ja/overviews/collections/seqs.md index 4c15cdbaa2..b1d7c9f57a 100644 --- a/ja/overviews/collections/seqs.md.disabled +++ b/ja/overviews/collections/seqs.md @@ -69,7 +69,7 @@ Scala の他の構文の例にならって、`seq(idx) = elem` は `seq.update(i | **集合演算:** | | | `xs intersect ys` |列 `xs` と `ys` の積集合で、`xs` における要素の順序を保ったもの。| | `xs diff ys` |列 `xs` と `ys` の差集合で、`xs` における要素の順序を保ったもの。| -| `xs union ys` |和集合; `xs ++ ys` に同じ| +| `xs union ys` |和集合; `xs ++ ys` に同じ。 | | `xs.distinct` |`xs` の部分列で要素の重複を一切含まないもの。 | [`Seq`](http://www.scala-lang.org/api/{{ site.scala-version }}/scala/collection/Seq.html) トレイトには [`LinearSeq`](http://www.scala-lang.org/api/{{ site.scala-version }}/scala/collection/IndexedSeq.html) と [`IndexedSeq`](http://www.scala-lang.org/api/{{ site.scala-version }}/scala/collection/IndexedSeq.html) diff --git a/ja/overviews/collections/sets.md.disabled b/ja/overviews/collections/sets.md similarity index 97% rename from ja/overviews/collections/sets.md.disabled rename to ja/overviews/collections/sets.md index 8ec8d264be..287a5b3141 100644 --- a/ja/overviews/collections/sets.md.disabled +++ b/ja/overviews/collections/sets.md @@ -17,7 +17,7 @@ language: ja val fruit = Set("apple", "orange", "peach", "banana") - fruit: scala.collection.immutable.Set[java.lang.String] = + fruit: scala.collection.immutable.Set[java.lang.String] = Set(apple, orange, peach, banana) scala> fruit("peach") res0: Boolean = true @@ -48,11 +48,11 @@ language: ja | `xs.empty` |`xs` と同じクラスの空集合。| | **集合演算:** | | | `xs & ys` |`xs` と `ys` の積集合。| -| `xs intersect ys` |`xs & ys` に同じ| +| `xs intersect ys` |`xs & ys` に同じ。 | | `xs | ys` |`xs` と `ys` の和集合。| -| `xs union ys` |`xs | ys` に同じ| +| `xs union ys` |`xs | ys` に同じ。 | | `xs &~ ys` |`xs` と `ys` の差集合。| -| `xs diff ys` |`xs &~ ys` に同じ| +| `xs diff ys` |`xs &~ ys` に同じ。 | 可変集合は、この表にまとめてあるとおり、加算、減算、更新演算などの新たなメソッドを追加する。 From 2c4d4ed8f77cf3d2f0675e026f1ae720097b2ed5 Mon Sep 17 00:00:00 2001 From: Eugene Yokota Date: Fri, 13 Sep 2013 15:04:27 -0400 Subject: [PATCH 4/4] Use redcarpet (GitHub Flavored Markdown) --- _config.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/_config.yml b/_config.yml index 0d38da8289..21c135bdbd 100644 --- a/_config.yml +++ b/_config.yml @@ -17,4 +17,6 @@ pygments: true permalink: /:categories/:title.html baseurl: -# markdown: rdiscount \ No newline at end of file +markdown: redcarpet +redcarpet: + extensions: ["no_intra_emphasis", "fenced_code_blocks", "autolink", "tables", "with_toc_data"]