diff --git a/content/ja/docs/2.for-users/1.index.md b/content/ja/docs/2.for-users/1.index.md
index c3e07f71..aa5b8c7e 100644
--- a/content/ja/docs/2.for-users/1.index.md
+++ b/content/ja/docs/2.for-users/1.index.md
@@ -1,4 +1,4 @@
-# Misskey ユーザー向け
+# ユーザー向けガイド
 このセクションでは、Misskeyを初めて利用する方はもちろん、すでに利用されている方にも役立つ一般的な機能についてご紹介しています。
 
 <MkIndex />
diff --git a/content/ja/.docs-legacy/getting-started.md b/content/ja/docs/2.for-users/2.onboarding/1.index.md
similarity index 84%
rename from content/ja/.docs-legacy/getting-started.md
rename to content/ja/docs/2.for-users/2.onboarding/1.index.md
index 9cc6c127..da4322d1 100644
--- a/content/ja/.docs-legacy/getting-started.md
+++ b/content/ja/docs/2.for-users/2.onboarding/1.index.md
@@ -1,3 +1,6 @@
+---
+description: "Misskeyサーバーへのユーザー登録や、基本的な操作について解説しています。"
+---
 # Misskeyを始めよう
 Misskeyはソフトウェアおよびそのプロジェクトです。
 インターネットに公開されている、Misskeyを動かしているサーバーのことを**サーバー**と呼びます。
@@ -8,7 +11,7 @@ Misskeyを利用するには、どこかのサーバーにアカウントを作
 :::tip
 どのサーバーを選んでも、他のサーバーのユーザーとやり取りすることができます。
 
-:::g-details
+:::g-details{summary='詳細'}
 Misskeyには連合機能が備わっています。
 
 連合機能によって、別のサーバーのユーザーであっても、同じサーバーのユーザーと同じようにフォローやリアクション、Renoteなどができるようになっています。
@@ -16,9 +19,13 @@ Misskeyには連合機能が備わっています。
 Misskeyが搭載している連合機能はActivityPubというオープンな共通規格に基づいていて、MastodonやPleromaといったほかのソフトウェアとも互換性があります。
 :::
 
+:::
+
 ## サーバーの選び方
 ### サーバーのテーマ
 サーバーによっては、例えば「特定のこと、ものが好き」といったテーマが決まっている場合があります。
 自分にあったテーマのサーバーを探すのもおすすめです。
 
-### サーバーのユーザー層
+:::tip
+サーバーの一覧は[こちら](/servers/)からご覧いただけます。
+:::
\ No newline at end of file
diff --git a/content/ja/docs/2.for-users/2.features/1.index.md b/content/ja/docs/2.for-users/3.features/1.index.md
similarity index 100%
rename from content/ja/docs/2.for-users/2.features/1.index.md
rename to content/ja/docs/2.for-users/3.features/1.index.md
diff --git a/content/ja/docs/2.for-users/2.features/ads.md b/content/ja/docs/2.for-users/3.features/ads.md
similarity index 100%
rename from content/ja/docs/2.for-users/2.features/ads.md
rename to content/ja/docs/2.for-users/3.features/ads.md
diff --git a/content/ja/docs/2.for-users/2.features/antenna.md b/content/ja/docs/2.for-users/3.features/antenna.md
similarity index 100%
rename from content/ja/docs/2.for-users/2.features/antenna.md
rename to content/ja/docs/2.for-users/3.features/antenna.md
diff --git a/content/ja/docs/2.for-users/2.features/charts.md b/content/ja/docs/2.for-users/3.features/charts.md
similarity index 100%
rename from content/ja/docs/2.for-users/2.features/charts.md
rename to content/ja/docs/2.for-users/3.features/charts.md
diff --git a/content/ja/docs/2.for-users/2.features/clip.md b/content/ja/docs/2.for-users/3.features/clip.md
similarity index 100%
rename from content/ja/docs/2.for-users/2.features/clip.md
rename to content/ja/docs/2.for-users/3.features/clip.md
diff --git a/content/ja/docs/2.for-users/2.features/custom-emoji.md b/content/ja/docs/2.for-users/3.features/custom-emoji.md
similarity index 100%
rename from content/ja/docs/2.for-users/2.features/custom-emoji.md
rename to content/ja/docs/2.for-users/3.features/custom-emoji.md
diff --git a/content/ja/docs/2.for-users/2.features/deck.md b/content/ja/docs/2.for-users/3.features/deck.md
similarity index 100%
rename from content/ja/docs/2.for-users/2.features/deck.md
rename to content/ja/docs/2.for-users/3.features/deck.md
diff --git a/content/ja/docs/2.for-users/2.features/drive.md b/content/ja/docs/2.for-users/3.features/drive.md
similarity index 100%
rename from content/ja/docs/2.for-users/2.features/drive.md
rename to content/ja/docs/2.for-users/3.features/drive.md
diff --git a/content/ja/docs/2.for-users/2.features/favorite.md b/content/ja/docs/2.for-users/3.features/favorite.md
similarity index 100%
rename from content/ja/docs/2.for-users/2.features/favorite.md
rename to content/ja/docs/2.for-users/3.features/favorite.md
diff --git a/content/ja/docs/2.for-users/2.features/follow.md b/content/ja/docs/2.for-users/3.features/follow.md
similarity index 100%
rename from content/ja/docs/2.for-users/2.features/follow.md
rename to content/ja/docs/2.for-users/3.features/follow.md
diff --git a/content/ja/docs/2.for-users/2.features/hashtag.md b/content/ja/docs/2.for-users/3.features/hashtag.md
similarity index 100%
rename from content/ja/docs/2.for-users/2.features/hashtag.md
rename to content/ja/docs/2.for-users/3.features/hashtag.md
diff --git a/content/ja/docs/2.for-users/2.features/mention.md b/content/ja/docs/2.for-users/3.features/mention.md
similarity index 100%
rename from content/ja/docs/2.for-users/2.features/mention.md
rename to content/ja/docs/2.for-users/3.features/mention.md
diff --git a/content/ja/docs/2.for-users/2.features/mfm.md b/content/ja/docs/2.for-users/3.features/mfm.md
similarity index 100%
rename from content/ja/docs/2.for-users/2.features/mfm.md
rename to content/ja/docs/2.for-users/3.features/mfm.md
diff --git a/content/ja/docs/2.for-users/2.features/mute-and-block.md b/content/ja/docs/2.for-users/3.features/mute-and-block.md
similarity index 100%
rename from content/ja/docs/2.for-users/2.features/mute-and-block.md
rename to content/ja/docs/2.for-users/3.features/mute-and-block.md
diff --git a/content/ja/docs/2.for-users/2.features/note.md b/content/ja/docs/2.for-users/3.features/note.md
similarity index 100%
rename from content/ja/docs/2.for-users/2.features/note.md
rename to content/ja/docs/2.for-users/3.features/note.md
diff --git a/content/ja/docs/2.for-users/2.features/online-status.md b/content/ja/docs/2.for-users/3.features/online-status.md
similarity index 100%
rename from content/ja/docs/2.for-users/2.features/online-status.md
rename to content/ja/docs/2.for-users/3.features/online-status.md
diff --git a/content/ja/docs/2.for-users/2.features/pages.md b/content/ja/docs/2.for-users/3.features/pages.md
similarity index 100%
rename from content/ja/docs/2.for-users/2.features/pages.md
rename to content/ja/docs/2.for-users/3.features/pages.md
diff --git a/content/ja/docs/2.for-users/2.features/plugin.md b/content/ja/docs/2.for-users/3.features/plugin.md
similarity index 100%
rename from content/ja/docs/2.for-users/2.features/plugin.md
rename to content/ja/docs/2.for-users/3.features/plugin.md
diff --git a/content/ja/docs/2.for-users/2.features/reaction.md b/content/ja/docs/2.for-users/3.features/reaction.md
similarity index 100%
rename from content/ja/docs/2.for-users/2.features/reaction.md
rename to content/ja/docs/2.for-users/3.features/reaction.md
diff --git a/content/ja/docs/2.for-users/2.features/share-form.md b/content/ja/docs/2.for-users/3.features/share-form.md
similarity index 100%
rename from content/ja/docs/2.for-users/2.features/share-form.md
rename to content/ja/docs/2.for-users/3.features/share-form.md
diff --git a/content/ja/docs/2.for-users/2.features/silence.md b/content/ja/docs/2.for-users/3.features/silence.md
similarity index 100%
rename from content/ja/docs/2.for-users/2.features/silence.md
rename to content/ja/docs/2.for-users/3.features/silence.md
diff --git a/content/ja/docs/2.for-users/2.features/theme.md b/content/ja/docs/2.for-users/3.features/theme.md
similarity index 100%
rename from content/ja/docs/2.for-users/2.features/theme.md
rename to content/ja/docs/2.for-users/3.features/theme.md
diff --git a/content/ja/docs/2.for-users/2.features/thread-mute.md b/content/ja/docs/2.for-users/3.features/thread-mute.md
similarity index 100%
rename from content/ja/docs/2.for-users/2.features/thread-mute.md
rename to content/ja/docs/2.for-users/3.features/thread-mute.md
diff --git a/content/ja/docs/2.for-users/2.features/timeline.md b/content/ja/docs/2.for-users/3.features/timeline.md
similarity index 100%
rename from content/ja/docs/2.for-users/2.features/timeline.md
rename to content/ja/docs/2.for-users/3.features/timeline.md
diff --git a/content/ja/docs/2.for-users/2.features/webhook.md b/content/ja/docs/2.for-users/3.features/webhook.md
similarity index 100%
rename from content/ja/docs/2.for-users/2.features/webhook.md
rename to content/ja/docs/2.for-users/3.features/webhook.md
diff --git a/content/ja/docs/2.for-users/2.features/widgets.md b/content/ja/docs/2.for-users/3.features/widgets.md
similarity index 100%
rename from content/ja/docs/2.for-users/2.features/widgets.md
rename to content/ja/docs/2.for-users/3.features/widgets.md
diff --git a/content/ja/docs/2.for-users/2.features/word-mute.md b/content/ja/docs/2.for-users/3.features/word-mute.md
similarity index 100%
rename from content/ja/docs/2.for-users/2.features/word-mute.md
rename to content/ja/docs/2.for-users/3.features/word-mute.md