diff --git a/ja/overviews/collections/trait-iterable.md b/ja/overviews/collections/trait-iterable.md
index 2711c481f5..acce5ca56b 100644
--- a/ja/overviews/collections/trait-iterable.md
+++ b/ja/overviews/collections/trait-iterable.md
@@ -49,14 +49,11 @@ language: ja
 |  `xs grouped size`        |このコレクション内の要素を固定サイズの「かたまり」にして返すイテレータ。|
 |  `xs sliding size`        |このコレクション内の要素を固定サイズの「窓」をスライドさせて返すイテレータ。|
 |  **サブコレクション取得演算:**　|                           |
-|  `xs takeRight n`         |`xs` の最後の `n` 個の要素から成るコレクション
-(順序が定義されていない場合は、任意の `n` 個の要素から成るコレクション)。|
-|  `xs dropRight n`         |コレクションから `xs` `takeRight` `n`
-を除いた残りの部分。|
+|  `xs takeRight n`         |`xs` の最後の `n` 個の要素から成るコレクション (順序が定義されていない場合は、任意の `n` 個の要素から成るコレクション)。|
+|  `xs dropRight n`         |コレクションから `xs` `takeRight` `n` を除いた残りの部分。|
 |  **zip 演算:**             |                                               |
 |  `xs zip ys`              |`xs` と `ys` のそれぞれから対応する要素をペアにした　`Iterable`。|
-|  `xs zipAll (ys, x, y)`   |`xs` と `ys` のそれぞれから対応する要素をペアにした
-`Iterable` で、もし片方が短い場合は `x` か `y` を使って長いほうに合わせる。|
+|  `xs zipAll (ys, x, y)`   |`xs` と `ys` のそれぞれから対応する要素をペアにした `Iterable` で、もし片方が短い場合は `x` か `y` を使って長いほうに合わせる。|
 |  `xs.zipWithIndex`        |`xs`内の要素とその添字をペアにした `Iterable`。|
 |  **比較演算:**        　　  |                                               |
 |  `xs sameElements ys`     |`xs` と `ys` が同じ要素を同じ順序で格納しているかを調べる。|
diff --git a/ja/overviews/macros/annotations.md b/ja/overviews/macros/annotations.md
index 6d548d3213..8303503365 100644
--- a/ja/overviews/macros/annotations.md
+++ b/ja/overviews/macros/annotations.md
@@ -5,8 +5,8 @@ language: ja
 disqus: true
 
 partof: macros
-num: 7
-outof: 9
+num: 6
+outof: 8
 title: マクロアノテーション
 ---
 <span class="label important" style="float: right;">MACRO PARADISE</span>
diff --git a/ja/overviews/macros/bundles.md b/ja/overviews/macros/bundles.md
index 62b89a3fe7..a928706d44 100644
--- a/ja/overviews/macros/bundles.md
+++ b/ja/overviews/macros/bundles.md
@@ -5,8 +5,7 @@ language: ja
 disqus: true
 
 partof: macros
-num: 4
-outof: 9
+num: 3
 title: マクロバンドル
 ---
 <span class="label warning" style="float: right;">EXPERIMENTAL</span>
diff --git a/ja/overviews/macros/implicits.md b/ja/overviews/macros/implicits.md
index 5069d75bac..bdadd83ce8 100644
--- a/ja/overviews/macros/implicits.md
+++ b/ja/overviews/macros/implicits.md
@@ -5,8 +5,7 @@ language: ja
 disqus: true
 
 partof: macros
-num: 5
-outof: 9
+num: 4
 title: implicit マクロ
 ---
 <span class="label warning" style="float: right;">EXPERIMENTAL</span>
diff --git a/ja/overviews/macros/overview.md b/ja/overviews/macros/overview.md
index 8e226acb4a..e08d4049f3 100644
--- a/ja/overviews/macros/overview.md
+++ b/ja/overviews/macros/overview.md
@@ -5,8 +5,7 @@ language: ja
 disqus: true
 
 partof: macros
-num: 3
-outof: 9
+num: 2
 title: def マクロ
 ---
 <span class="label warning" style="float: right;">EXPERIMENTAL</span>
diff --git a/ja/overviews/macros/paradise.md b/ja/overviews/macros/paradise.md
index 5c60ce3ba8..2116c60735 100644
--- a/ja/overviews/macros/paradise.md
+++ b/ja/overviews/macros/paradise.md
@@ -5,8 +5,7 @@ language: ja
 disqus: true
 
 partof: macros
-num: 8
-outof: 9
+num: 7
 title: マクロパラダイス
 ---
 <span class="label success" style="float: right;">NEW</span>
diff --git a/ja/overviews/macros/quasiquotes.md b/ja/overviews/macros/quasiquotes.md
index 0054286b47..e2d3d029e9 100644
--- a/ja/overviews/macros/quasiquotes.md
+++ b/ja/overviews/macros/quasiquotes.md
@@ -5,8 +5,7 @@ language: ja
 disqus: true
 
 partof: macros
-num: 6
-outof: 9
+num: 5
 title: 準クォート
 ---
 <a href="/ja/overviews/macros/paradise.html"><span class="label important" style="float: right;">MACRO PARADISE</span></a>
diff --git a/ja/overviews/macros/roadmap.md b/ja/overviews/macros/roadmap.md
index b88709b116..c7a4514aaa 100644
--- a/ja/overviews/macros/roadmap.md
+++ b/ja/overviews/macros/roadmap.md
@@ -5,8 +5,7 @@ language: ja
 disqus: true
 
 partof: macros
-num: 9
-outof: 9
+num: 8
 title: ロードマップ
 ---
 
diff --git a/ja/overviews/macros/toc.md b/ja/overviews/macros/toc.md
deleted file mode 100644
index 2755cac244..0000000000
--- a/ja/overviews/macros/toc.md
+++ /dev/null
@@ -1,21 +0,0 @@
----
-layout: overview-large
-
-language: ja
-
-disqus: true
-
-partof: macros
-num: 1
-outof: 9
-title: 目次
----
-
-1. [ユースケース](/ja/overviews/macros/usecases.html)
-1. [def マクロ](/ja/overviews/macros/overview.html)
-1. [マクロバンドル](/ja/overviews/macros/bundles.html)
-1. [implicit マクロ](/ja/overviews/macros/implicits.html)
-1. [準クォート](/ja/overviews/macros/quasiquotes.html)
-1. [マクロアノテーション](/ja/overviews/macros/annotations.html)
-1. [マクロパラダイス](/ja/overviews/macros/paradise.html)
-1. [ロードマップ](/ja/overviews/macros/roadmap.html)
diff --git a/ja/overviews/macros/usecases.md b/ja/overviews/macros/usecases.md
index bb0322e9ed..98f35e99d0 100644
--- a/ja/overviews/macros/usecases.md
+++ b/ja/overviews/macros/usecases.md
@@ -5,8 +5,7 @@ language: ja
 disqus: true
 
 partof: macros
-num: 2
-outof: 9
+num: 1
 title: ユースケース
 ---
 
diff --git a/overviews/macros/annotations.md b/overviews/macros/annotations.md
index fa87c75e85..d5f297df06 100644
--- a/overviews/macros/annotations.md
+++ b/overviews/macros/annotations.md
@@ -5,8 +5,8 @@ title: Macro Annotations
 disqus: true
 
 partof: macros
-num: 9
-outof: 11
+num: 8
+outof: 10
 languages: [ja]
 ---
 <span class="label important" style="float: right;">MACRO PARADISE</span>
diff --git a/overviews/macros/blackbox-whitebox.md b/overviews/macros/blackbox-whitebox.md
index ebbdaa6e66..bbe5d4c270 100644
--- a/overviews/macros/blackbox-whitebox.md
+++ b/overviews/macros/blackbox-whitebox.md
@@ -5,8 +5,7 @@ title: Blackbox Vs Whitebox
 disqus: true
 
 partof: macros
-num: 3
-outof: 11
+num: 2
 ---
 <span class="label warning" style="float: right;">EXPERIMENTAL</span>
 
diff --git a/overviews/macros/bundles.md b/overviews/macros/bundles.md
index 324c2ef427..049ef4d009 100644
--- a/overviews/macros/bundles.md
+++ b/overviews/macros/bundles.md
@@ -5,8 +5,7 @@ title: Macro Bundles
 disqus: true
 
 partof: macros
-num: 5
-outof: 11
+num: 4
 languages: [ja]
 ---
 <span class="label warning" style="float: right;">EXPERIMENTAL</span>
diff --git a/overviews/macros/implicits.md b/overviews/macros/implicits.md
index 9661e5f2e2..b582a92562 100644
--- a/overviews/macros/implicits.md
+++ b/overviews/macros/implicits.md
@@ -5,8 +5,7 @@ title: Implicit Macros
 disqus: true
 
 partof: macros
-num: 6
-outof: 11
+num: 5
 languages: [ja]
 ---
 <span class="label warning" style="float: right;">EXPERIMENTAL</span>
diff --git a/overviews/macros/overview.md b/overviews/macros/overview.md
index 7b62f158cf..88f60c7198 100644
--- a/overviews/macros/overview.md
+++ b/overviews/macros/overview.md
@@ -5,8 +5,7 @@ title: Def Macros
 disqus: true
 
 partof: macros
-num: 4
-outof: 11
+num: 3
 languages: [ja]
 ---
 <span class="label warning" style="float: right;">EXPERIMENTAL</span>
diff --git a/overviews/macros/paradise.md b/overviews/macros/paradise.md
index 88eb49fbbe..3db590a88a 100644
--- a/overviews/macros/paradise.md
+++ b/overviews/macros/paradise.md
@@ -5,8 +5,7 @@ title: Macro Paradise
 disqus: true
 
 partof: macros
-num: 10
-outof: 11
+num: 9
 languages: [ja]
 ---
 <span class="label success" style="float: right;">NEW</span>
diff --git a/overviews/macros/quasiquotes.md b/overviews/macros/quasiquotes.md
index 1a2ae836cd..3989184156 100644
--- a/overviews/macros/quasiquotes.md
+++ b/overviews/macros/quasiquotes.md
@@ -5,8 +5,7 @@ title: Quasiquotes
 disqus: true
 
 partof: macros
-num: 8
-outof: 11
+num: 7
 languages: [ja]
 ---
 <span class="label warning" style="float: right;">EXPERIMENTAL</span>
diff --git a/overviews/macros/roadmap.md b/overviews/macros/roadmap.md
index 7f11926b2c..224eae4367 100644
--- a/overviews/macros/roadmap.md
+++ b/overviews/macros/roadmap.md
@@ -5,8 +5,7 @@ title: Roadmap
 disqus: true
 
 partof: macros
-num: 11
-outof: 11
+num: 10
 languages: [ja]
 ---
 
diff --git a/overviews/macros/toc.md b/overviews/macros/toc.md
deleted file mode 100644
index c5c84578fb..0000000000
--- a/overviews/macros/toc.md
+++ /dev/null
@@ -1,22 +0,0 @@
----
-layout: overview-large
-title: Table of Contents
-
-disqus: true
-
-partof: macros
-num: 1
-outof: 11
-languages: [ja]
----
-
-1. [Use Cases](/overviews/macros/usecases.html)
-1. [Blackbox Vs Whitebox](/overviews/macros/blackbox-whitebox.html)
-1. [Def Macros](/overviews/macros/overview.html)
-1. [Macro Bundles](/overviews/macros/bundles.html)
-1. [Implicit Macros](/overviews/macros/implicits.html)
-1. [Type Providers](/overviews/macros/typeproviders.html)
-1. [Quasiquotes](/overviews/macros/quasiquotes.html)
-1. [Macro Annotations](/overviews/macros/annotations.html)
-1. [Macro Paradise](/overviews/macros/paradise.html)
-1. [Roadmap](/overviews/macros/roadmap.html)
diff --git a/overviews/macros/typeproviders.md b/overviews/macros/typeproviders.md
index 2ffe745be1..d21ac141cb 100644
--- a/overviews/macros/typeproviders.md
+++ b/overviews/macros/typeproviders.md
@@ -5,8 +5,7 @@ title: Type Providers
 disqus: true
 
 partof: macros
-num: 7
-outof: 11
+num: 6
 languages: [ja]
 ---
 <span class="label warning" style="float: right;">EXPERIMENTAL</span>
diff --git a/overviews/macros/usecases.md b/overviews/macros/usecases.md
index acb63e0411..e1495bb9a5 100644
--- a/overviews/macros/usecases.md
+++ b/overviews/macros/usecases.md
@@ -5,8 +5,7 @@ title: Use Cases
 disqus: true
 
 partof: macros
-num: 2
-outof: 11
+num: 1
 languages: [ja]
 ---