scala · SethTisue · Mar 25, 2016 · Mar 24, 2016
diff --git a/ja/overviews/index.md b/ja/overviews/index.md
@@ -57,7 +57,7 @@ title: ガイドと概要
      * [ユースケース](/ja/overviews/macros/usecases.html)
      * [blackbox vs whitebox](/ja/overviews/macros/blackbox-whitebox.html)
      * [def マクロ](/ja/overviews/macros/overview.html)
-     * [準クォート](/ja/overviews/macros/quasiquotes.html)
+     * [準クォート](/ja/overviews/quasiquotes/intro.html)
      * [マクロバンドル](/ja/overviews/macros/bundles.html)
      * [implicit マクロ](/ja/overviews/macros/implicits.html)
      * [抽出子マクロ](/ja/overviews/macros/extractors.html)

diff --git a/ja/overviews/macros/overview.md b/ja/overviews/macros/overview.md
@@ -21,7 +21,7 @@ def マクロ機能の一部が、徹底した仕様が書かれることを条
 <span class="label success">追記</span> このガイドは Scala 2.10.0 向けに書かれたもので、現在は Scala 2.11.x 系リリースサイクルのまっただ中なので当然本稿の内容が古くなっている。
 しかしながら、このガイドが廃れたかと言うとそうとも言えなくて、ここで書かれていることの全ては Scala 2.10.x と Scala 2.11.x
 の両方で動作するため目を通す価値はあるはずだ。
-これを読んだ後で、[準クォート](/overviews/macros/quasiquotes.html)と
+これを読んだ後で、[準クォート](/overviews/quasiquotes/intro.html)と
 [マクロバンドル](/ja/overviews/macros/bundles.html)のガイドからマクロ定義を簡略化する最新情報を仕入れてほしい。
 さらに詳しい具体例を調べるには [macro workshop](https://github.com/scalamacros/macrology201)
 も参考にしてほしい。

diff --git a/ja/overviews/macros/roadmap.md b/ja/overviews/macros/roadmap.md
@@ -31,7 +31,7 @@ title: ロードマップ
 | [implicit マクロ](/ja/overviews/macros/implicits.html)                               | Yes (since 2.10.2)         | Yes <sup>1</sup>                                 | Yes                        | Yes <sup>1</sup>                                 | Yes                         | Yes <sup>1</sup>                                 |
 | [関数従属性の具現化](/ja/overviews/macros/implicits.html#fundep_materialization) | No                         | Yes <sup>2</sup>                                 | Yes                        | Yes <sup>1</sup>                                 | Yes                         | Yes <sup>1</sup>                                 |
 | [型プロバイダ](/ja/overviews/macros/typeproviders.html)                            | 一部サポート (see docs) | Yes <sup>2</sup>                                 | 一部サポート (see docs) | Yes <sup>2</sup>                                 | 一部サポート (see docs)  | Yes <sup>2</sup>                                 |
-| [準クォート](/ja/overviews/macros/quasiquotes.html)                                 | No                         | Yes <sup>1</sup>                                 | Yes                        | Yes <sup>1</sup>                                 | Yes                         | Yes <sup>1</sup>                                 |
+| [準クォート](/ja/overviews/quasiquotes/intro.html)                                 | No                         | Yes <sup>1</sup>                                 | Yes                        | Yes <sup>1</sup>                                 | Yes                         | Yes <sup>1</sup>                                 |
 | [型マクロ](/ja/overviews/macros/typemacros.html)                                  | No                         | No                                               | No                         | No                                               | No                          | No                                               |
 | [型指定の無いマクロ](/ja/overviews/macros/untypedmacros.html)                            | No                         | No                                               | No                         | No                                               | No                          | No                                               |
 | [マクロアノテーション](/ja/overviews/macros/annotations.html)                           | No                         | Yes <sup>2</sup>                                 | No                         | Yes <sup>2</sup>                                 | No                          | Yes <sup>2</sup>                                 |

diff --git a/ja/overviews/macros/typemacros.md b/ja/overviews/macros/typemacros.md
@@ -99,4 +99,4 @@ Scala のプログラムにおいて型マクロは、type、applied type、pare
 
 ### クラスやオブジェクトの生成
 
-[StackOverflow](http://stackoverflow.com/questions/13795490/how-to-use-type-calculated-in-scala-macro-in-a-reify-clause) でも説明したが、型マクロを作っていると `reify` がどんどん役に立たなくなっていくことに気付くだろう。その場合は、手で構文木を構築するだけではなく、マクロパラダイスにあるもう1つの実験的機能である[準クォート](/ja/overviews/macros/quasiquotes.html)を使うことも検討してみてほしい。
+[StackOverflow](http://stackoverflow.com/questions/13795490/how-to-use-type-calculated-in-scala-macro-in-a-reify-clause) でも説明したが、型マクロを作っていると `reify` がどんどん役に立たなくなっていくことに気付くだろう。その場合は、手で構文木を構築するだけではなく、マクロパラダイスにあるもう1つの実験的機能である[準クォート](/ja/overviews/quasiquotes/intro.html)を使うことも検討してみてほしい。
diff --git a/overviews/index.md b/overviews/index.md
@@ -72,7 +72,7 @@ languages: [ja, zh-cn, es]
     * [Use Cases](/overviews/macros/usecases.html)
     * [Blackbox Vs Whitebox](/overviews/macros/blackbox-whitebox.html)
     * [Def Macros](/overviews/macros/overview.html)
-    * [Quasiquotes](/overviews/macros/quasiquotes.html)
+    * [Quasiquotes](/overviews/quasiquotes/intro.html)
     * [Macro Bundles](/overviews/macros/bundles.html)
     * [Implicit Macros](/overviews/macros/implicits.html)
     * [Extractor Macros](/overviews/macros/extractors.html)

diff --git a/overviews/macros/changelog211.md b/overviews/macros/changelog211.md
@@ -17,7 +17,7 @@ This document lists all major changes to reflection and macros during the develo
 
 ### Quasiquotes
 
-Quasiquotes is the single most impressive upgrade for reflection and macros in Scala 2.11.0. Implemented by Denys Shabalin, they have significantly simplified the life of Scala metaprogrammers around the globe. Visit [the dedicated documentation page](/overviews/macros/quasiquotes.html) to learn more about quasiquotes.
+Quasiquotes is the single most impressive upgrade for reflection and macros in Scala 2.11.0. Implemented by Denys Shabalin, they have significantly simplified the life of Scala metaprogrammers around the globe. Visit [the dedicated documentation page](/overviews/quasiquotes/intro.html) to learn more about quasiquotes.
 
 ### New macro powers
 

diff --git a/overviews/macros/overview.md b/overviews/macros/overview.md
@@ -19,7 +19,7 @@ A subset of def macros, pending a thorough specification, is tentatively schedul
 <span class="label success">UPDATE</span> This guide has been written for Scala 2.10.0, and now we're well into the Scala 2.11.x release cycle,
 so naturally the contents of the document are outdated. Nevertheless, this guide is not obsolete -
 everything written here will still work in both Scala 2.10.x and Scala 2.11.x, so it will be helpful to read it through.
-After reading the guide, take a look at the docs on [quasiquotes](/overviews/macros/quasiquotes.html)
+After reading the guide, take a look at the docs on [quasiquotes](/overviews/quasiquotes/intro.html)
 and [macro bundles](/overviews/macros/bundles.html) to familiarize yourself with latest developments
 that dramatically simplify writing macros. Then it might be a good idea to follow
 [our macro workshop](https://github.com/scalamacros/macrology201) for more in-depth examples.

diff --git a/overviews/macros/roadmap.md b/overviews/macros/roadmap.md
@@ -31,11 +31,11 @@ and become the new standard way of doing metaprogramming in Scala.
 | [Implicit macros](/overviews/macros/implicits.html)                               | Yes (since 2.10.2)              | Yes <sup>1</sup>                                 | Yes                        | Yes <sup>1</sup>                                 | Yes                         | Yes <sup>1</sup>                                 |
 | [Fundep materialization](/overviews/macros/implicits.html#fundep_materialization) | Yes (since 2.10.5) <sup>3</sup> | Yes <sup>2</sup>                                 | Yes                        | Yes <sup>1</sup>                                 | Yes                         | Yes <sup>1</sup>                                 |
 | [Type providers](/overviews/macros/typeproviders.html)                            | Partial support (see docs)      | Yes <sup>2</sup>                                 | Partial support (see docs) | Yes <sup>2</sup>                                 | Partial support (see docs)  | Yes <sup>2</sup>                                 |
-| [Quasiquotes](/overviews/macros/quasiquotes.html)                                 | No                              | Yes <sup>1</sup>                                 | Yes                        | Yes <sup>1</sup>                                 | Yes                         | Yes <sup>1</sup>                                 |
+| [Quasiquotes](/overviews/quasiquotes/intro.html)                                 | No                              | Yes <sup>1</sup>                                 | Yes                        | Yes <sup>1</sup>                                 | Yes                         | Yes <sup>1</sup>                                 |
 | [Type macros](/overviews/macros/typemacros.html)                                  | No                              | No                                               | No                         | No                                               | No                          | No                                               |
 | [Untyped macros](/overviews/macros/untypedmacros.html)                            | No                              | No                                               | No                         | No                                               | No                          | No                                               |
 | [Macro annotations](/overviews/macros/annotations.html)                           | No                              | Yes <sup>2</sup>                                 | No                         | Yes <sup>2</sup>                                 | No                          | Yes <sup>2</sup>                                 |
 
 <p><sup>1</sup> This feature doesn't bring a compile-time or a runtime dependency on macro paradise. This means that neither compiling against your bytecode that uses this feature, nor running this bytecode requires the macro paradise plugin to be present on classpath.</p>
 <p><sup>2</sup> This feature brings a compile-time, but not a runtime dependency on macro paradise. This means that compiling against your bytecode that uses this feature will need the plugin to be added to your users' builds, however running this bytecode or results of macro expansions produced by this bytecode doesn't need additional classpath entries.</p>
-<p><sup>3</sup> Only works under <code>-Yfundep-materialization</code>.</p>
+<p><sup>3</sup> Only works under <code>-Yfundep-materialization</code>.</p>
diff --git a/overviews/macros/typemacros.md b/overviews/macros/typemacros.md
@@ -89,4 +89,4 @@ For example, a type macro used as `TM(2)(3)` in `class C extends TM(2)(3)` can e
 
 ### Generating classes and objects
 
-With type macros you might increasingly find yourself in a zone where `reify` is not applicable, as explained [at StackOverflow](http://stackoverflow.com/questions/13795490/how-to-use-type-calculated-in-scala-macro-in-a-reify-clause). In that case consider using [quasiquotes](/overviews/macros/quasiquotes.html), another experimental feature from macro paradise, as an alternative to manual tree construction.
+With type macros you might increasingly find yourself in a zone where `reify` is not applicable, as explained [at StackOverflow](http://stackoverflow.com/questions/13795490/how-to-use-type-calculated-in-scala-macro-in-a-reify-clause). In that case consider using [quasiquotes](/overviews/quasiquotes/intro.html), another experimental feature from macro paradise, as an alternative to manual tree construction.
Original file line number	Diff line number	Diff line change
Expand Up		@@ -99,4 +99,4 @@ Scala のプログラムにおいて型マクロは、type、applied type、pare

		### クラスやオブジェクトの生成

		[StackOverflow](http://stackoverflow.com/questions/13795490/how-to-use-type-calculated-in-scala-macro-in-a-reify-clause) でも説明したが、型マクロを作っていると `reify` がどんどん役に立たなくなっていくことに気付くだろう。その場合は、手で構文木を構築するだけではなく、マクロパラダイスにあるもう1つの実験的機能である[準クォート](/ja/overviews/macros/quasiquotes.html)を使うことも検討してみてほしい。
		[StackOverflow](http://stackoverflow.com/questions/13795490/how-to-use-type-calculated-in-scala-macro-in-a-reify-clause) でも説明したが、型マクロを作っていると `reify` がどんどん役に立たなくなっていくことに気付くだろう。その場合は、手で構文木を構築するだけではなく、マクロパラダイスにあるもう1つの実験的機能である[準クォート](/ja/overviews/quasiquotes/intro.html)を使うことも検討してみてほしい。
Original file line number	Diff line number	Diff line change
Expand Up		@@ -89,4 +89,4 @@ For example, a type macro used as `TM(2)(3)` in `class C extends TM(2)(3)` can e

		### Generating classes and objects

		With type macros you might increasingly find yourself in a zone where `reify` is not applicable, as explained [at StackOverflow](http://stackoverflow.com/questions/13795490/how-to-use-type-calculated-in-scala-macro-in-a-reify-clause). In that case consider using [quasiquotes](/overviews/macros/quasiquotes.html), another experimental feature from macro paradise, as an alternative to manual tree construction.
		With type macros you might increasingly find yourself in a zone where `reify` is not applicable, as explained [at StackOverflow](http://stackoverflow.com/questions/13795490/how-to-use-type-calculated-in-scala-macro-in-a-reify-clause). In that case consider using [quasiquotes](/overviews/quasiquotes/intro.html), another experimental feature from macro paradise, as an alternative to manual tree construction.