diff --git a/CHANGELOG.md b/CHANGELOG.md
index cb978c30f..1bbf21d40 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -33,6 +33,7 @@
 
 ### Implements
 
+- Improve the User Guide contents.
 - [non-AppStore ver.] Update Sparkle from 2.6.2 to 2.6.3.
 
 
diff --git a/CotEditor/CotEditor.help/Contents/Resources/en.lproj/CotEditor.html b/CotEditor/CotEditor.help/Contents/Resources/en.lproj/CotEditor.html
index 373392390..9fdb36d4d 100644
--- a/CotEditor/CotEditor.help/Contents/Resources/en.lproj/CotEditor.html
+++ b/CotEditor/CotEditor.help/Contents/Resources/en.lproj/CotEditor.html
@@ -45,9 +45,9 @@
 <img class="snapshot" src="gfx/ov_outline@2x.png" width="400"/>
 
 <h2>Quick overview of the document’s outline</h2>
-<p>The CotEditor’s Outline feature extracts predefined keywords from the document and shows them in a pop-up menu. By clicking on a listed item, you can go directly to the corresponding part of your document.</p>
+<p>The CotEditor’s Outline feature extracts predefined keywords from the document and shows them in a list. By clicking on a listed item, you can go directly to the corresponding part of your document.</p>
 <ul>
-	<li><a href="pgs/howto_show_outlinemenu.html">How to build Outline of a document</a></li>
+	<li><a href="pgs/howto_show_outlinemenu.html">How to inspect outline of a document</a></li>
 </ul>
 </section>
 
diff --git a/CotEditor/CotEditor.help/Contents/Resources/en.lproj/pgs/howto_inspect_fileinfo.html b/CotEditor/CotEditor.help/Contents/Resources/en.lproj/pgs/howto_inspect_fileinfo.html
index 2c38dc15c..a7cf484e6 100644
--- a/CotEditor/CotEditor.help/Contents/Resources/en.lproj/pgs/howto_inspect_fileinfo.html
+++ b/CotEditor/CotEditor.help/Contents/Resources/en.lproj/pgs/howto_inspect_fileinfo.html
@@ -22,6 +22,7 @@
 <p>The information appeares in the inspector is as follows:</p>
 
 <table>
+	<caption>Document File</caption>
 	<thead>
 		<tr><th>Item</th><th>Description</th></tr>
 	</thead>
@@ -33,18 +34,38 @@
 		<tr><th>Permission</th><td>The file privilege.</td></tr>
 		<tr><th>Full Path</th><td>The absolute path to the file in UNIX format.</td></tr>
 	</tbody>
+</table>
+
+<table>
+	<caption>Tet Settings</caption>
+	<thead>
+		<tr><th>Item</th><th>Description</th></tr>
+	</thead>
 	<tbody>
 		<tr><th>Encoding</th><td>The current selected text encoding.</td></tr>
 		<tr><th>Line Endings</th><td>The current selected line endings.</td></tr>
-	</tbody>
+		<tr><th>Mode</th><td>The current used mode in the editor.</td></tr>
+</table>
+
+<table>
+	<caption>Count</caption>
+	<thead>
+		<tr><th>Item</th><th>Description</th></tr>
+	</thead>
 	<tbody>
 		<tr><th>Characters</th><td>The number of characters in the document (and the selection).</td></tr>
         <tr><th>Lines</th><td>The number of lines in the document (and the selection).</td></tr>
-		<tr><th>Words</th><td>The number of words in the document (and the selection).  The current language in the Spelling window is used to interpret words.</td></tr>
+		<tr><th>Words</th><td>The number of words in the document (and the selection). The current language in the Spelling window is used to interpret words.</td></tr>
 		<tr><th>Location</th><td>The number of characters before the insertion point.</td></tr>
 		<tr><th>Line</th><td>The line number where the insertion point locates.</td></tr>
 		<tr><th>Column</th><td>The number of of characters from the head of the current line to the insertion point.</td></tr>
-	</tbody>
+</table>
+
+<table>
+	<caption>Character</caption>
+	<thead>
+		<tr><th>Item</th><th>Description</th></tr>
+	</thead>
 	<tbody>
 		<tr><th>Code Points</th><td>The Unicode code points for the selected character in hexadecimal (appeared only when single character is selected).</td></tr>
 	</tbody>
diff --git a/CotEditor/CotEditor.help/Contents/Resources/en.lproj/pgs/howto_show_outlinemenu.html b/CotEditor/CotEditor.help/Contents/Resources/en.lproj/pgs/howto_show_outlinemenu.html
index 882d29daf..d63562c4f 100644
--- a/CotEditor/CotEditor.help/Contents/Resources/en.lproj/pgs/howto_show_outlinemenu.html
+++ b/CotEditor/CotEditor.help/Contents/Resources/en.lproj/pgs/howto_show_outlinemenu.html
@@ -6,14 +6,14 @@
 	<link rel="stylesheet" href="../../Shared/sty/standard.css"/>
 	<script defer src="../../Shared/js/toc.js"></script>
 	
-	<title>Build Outline of a document in CotEditor</title>
+	<title>Inspect outline of a document in CotEditor</title>
 </head>
 
 <body>
 
-<h1>Build Outline of a document in CotEditor</h1>
+<h1>Inspect outline of a document in CotEditor</h1>
 
-<p>The <dfn>Outline feature</dfn> extracts specific parts of your document and generates a list according to the definition of the syntax.</p>
+<p>The CotEditor’s <dfn>Outline feature</dfn> extracts specific parts of your document and generates a list according to the definition of the syntax.</p>
 
 <p>The generated outline is shown in the navigation bar and the inspector.</p>
 
diff --git a/CotEditor/CotEditor.help/Contents/Resources/en.lproj/pgs/syntax_outline_settings.html b/CotEditor/CotEditor.help/Contents/Resources/en.lproj/pgs/syntax_outline_settings.html
index 5ce45f910..d15f62389 100644
--- a/CotEditor/CotEditor.help/Contents/Resources/en.lproj/pgs/syntax_outline_settings.html
+++ b/CotEditor/CotEditor.help/Contents/Resources/en.lproj/pgs/syntax_outline_settings.html
@@ -52,7 +52,7 @@
 <section id="cf">
 <h2>See also</h2>
 <ul>
-	<li><a href="howto_show_outlinemenu.html">Build Outline of a document</a></li>
+	<li><a href="howto_show_outlinemenu.html">Inspect outline of a document</a></li>
 	<li><a href="syntax_definition.html">Define a syntax</a></li>
 	<li><a href="about_regex.html">Use the regular expression</a></li>
 </ul>
diff --git a/CotEditor/CotEditor.help/Contents/Resources/en.lproj/toc.html b/CotEditor/CotEditor.help/Contents/Resources/en.lproj/toc.html
index fbeda2bb4..a1ee921df 100644
--- a/CotEditor/CotEditor.help/Contents/Resources/en.lproj/toc.html
+++ b/CotEditor/CotEditor.help/Contents/Resources/en.lproj/toc.html
@@ -54,7 +54,7 @@
 	<li><details>
 		<summary>Parse document syntax</summary>
 		<ul>
-			<li><a href="pgs/howto_show_outlinemenu.html">Build Outline of a document</a></li>
+			<li><a href="pgs/howto_show_outlinemenu.html">Inspect outline of a document</a></li>
 			<li><a href="pgs/syntax_definition.html">Define a syntax</a></li>
 			<li><a href="pgs/syntax_highlight_settings.html">Define syntax highlighting</a></li>
 			<li><a href="pgs/syntax_comment_settings.html">Define comment delimiters</a></li>
diff --git a/CotEditor/CotEditor.help/Contents/Resources/ja.lproj/CotEditor.html b/CotEditor/CotEditor.help/Contents/Resources/ja.lproj/CotEditor.html
index 8a4a92323..f7580a2d8 100644
--- a/CotEditor/CotEditor.help/Contents/Resources/ja.lproj/CotEditor.html
+++ b/CotEditor/CotEditor.help/Contents/Resources/ja.lproj/CotEditor.html
@@ -47,7 +47,7 @@
 <h2>書類のアウトラインを俯瞰する</h2>
 <p>書類から特定のキーワードを含む箇所をリストアップして、メニューとして表示します。メニューをクリックすると、書類の該当する個所へ移動します。</p>
 <ul>
-	<li><a href="pgs/howto_show_outlinemenu.html">書類のアウトラインを生成する方法</a></li>
+	<li><a href="pgs/howto_show_outlinemenu.html">書類のアウトラインを一覧する方法</a></li>
 </ul>
 </section>
 
diff --git a/CotEditor/CotEditor.help/Contents/Resources/ja.lproj/pgs/howto_inspect_fileinfo.html b/CotEditor/CotEditor.help/Contents/Resources/ja.lproj/pgs/howto_inspect_fileinfo.html
index c0d2bf283..d71890dce 100644
--- a/CotEditor/CotEditor.help/Contents/Resources/ja.lproj/pgs/howto_inspect_fileinfo.html
+++ b/CotEditor/CotEditor.help/Contents/Resources/ja.lproj/pgs/howto_inspect_fileinfo.html
@@ -22,6 +22,7 @@
 <p>表示される情報は下記の通りです。</p>
 
 <table>
+	<caption>書類ファイル</caption>
 	<thead>
 		<tr><th>項目</th><th>説明</th></tr>
 	</thead>
@@ -33,10 +34,25 @@
 		<tr><th>アクセス権</th><td>このファイルのアクセス権を表示します。</td></tr>
 		<tr><th>フルパス</th><td>このファイルまでのUNIX形式の絶対パスです。</td></tr>
 	</tbody>
+</table>
+
+<table>
+	<caption>テキスト設定</caption>
+	<thead>
+		<tr><th>項目</th><th>説明</th></tr>
+	</thead>
 	<tbody>
 		<tr><th>エンコーディング</th><td>現在選択されているテキストエンコーディングです。</td></tr>
 		<tr><th>改行コード</th><td>現在の選択されている改行コードです。</td></tr>
+		<tr><th>モード</th><td>現在使われているエディタのモードです。</td></tr>
 	</tbody>
+</table>
+
+<table>
+	<caption>カウント</caption>
+	<thead>
+		<tr><th>項目</th><th>説明</th></tr>
+	</thead>
 	<tbody>
 		<tr><th>文字数</th><td>書類内（および選択範囲内）の文字数です。</td></tr>
         <tr><th>行数</th><td>書類内（および選択範囲内）の行数です。</td></tr>
@@ -45,6 +61,13 @@
 		<tr><th>行</th><td>現在挿入ポイントがある行の行数です。</td></tr>
 		<tr><th>列</th><td>現在挿入ポイントがある位置のその行頭からの文字数です。</td></tr>
 	</tbody>
+</table>
+
+<table>
+	<caption>文字</caption>
+	<thead>
+		<tr><th>項目</th><th>説明</th></tr>
+	</thead>
 	<tbody>
 		<tr><th>コードポイント</th><td>選択している文字のUnicodeコードポイントの16進コードです。1文字だけを選択している時に表示されます。</td></tr>
 	</tbody>
diff --git a/CotEditor/CotEditor.help/Contents/Resources/ja.lproj/pgs/howto_show_outlinemenu.html b/CotEditor/CotEditor.help/Contents/Resources/ja.lproj/pgs/howto_show_outlinemenu.html
index 237a3da08..7a89b62ac 100644
--- a/CotEditor/CotEditor.help/Contents/Resources/ja.lproj/pgs/howto_show_outlinemenu.html
+++ b/CotEditor/CotEditor.help/Contents/Resources/ja.lproj/pgs/howto_show_outlinemenu.html
@@ -6,14 +6,14 @@
 	<link rel="stylesheet" href="../../Shared/sty/standard.css"/>
 	<script defer src="../../Shared/js/toc.js"></script>
 	
-	<title>CotEditorで書類のアウトラインを生成する</title>
+	<title>CotEditorで書類のアウトラインを一覧する</title>
 </head>
 
 <body>
 
-<h1>CotEditorで書類のアウトラインを生成する</h1>
+<h1>CotEditorで書類のアウトラインを一覧する</h1>
 
-<p><dfn>アウトライン</dfn>は、シンタックス定義に従って書類の該当する部分を抽出し一覧（アウトライン）を生成する機能です。</p>
+<p>CotEditorの<dfn>アウトライン</dfn>機能は、シンタックス定義に従って書類の該当する部分を抽出し一覧（アウトライン）を生成する機能です。</p>
 
 <p>生成されたアウトラインはナビゲーションバーとインスペクタの2箇所に表示できます。</p>
 
diff --git a/CotEditor/CotEditor.help/Contents/Resources/ja.lproj/pgs/syntax_outline_settings.html b/CotEditor/CotEditor.help/Contents/Resources/ja.lproj/pgs/syntax_outline_settings.html
index 42390d7b3..7146d6948 100644
--- a/CotEditor/CotEditor.help/Contents/Resources/ja.lproj/pgs/syntax_outline_settings.html
+++ b/CotEditor/CotEditor.help/Contents/Resources/ja.lproj/pgs/syntax_outline_settings.html
@@ -50,7 +50,7 @@
 <section id="cf">
 <h2>関連項目</h2>
 <ul>
-	<li><a href="howto_show_outlinemenu.html">書類のアウトラインを生成する</a></li>
+	<li><a href="howto_show_outlinemenu.html">書類のアウトラインを一覧する</a></li>
 	<li><a href="syntax_definition.html">シンタックスを定義する</a></li>
 	<li><a href="about_regex.html">正規表現を使う</a></li>
 </ul>
diff --git a/CotEditor/CotEditor.help/Contents/Resources/ja.lproj/toc.html b/CotEditor/CotEditor.help/Contents/Resources/ja.lproj/toc.html
index 48f0cd48e..df90e5327 100644
--- a/CotEditor/CotEditor.help/Contents/Resources/ja.lproj/toc.html
+++ b/CotEditor/CotEditor.help/Contents/Resources/ja.lproj/toc.html
@@ -54,7 +54,7 @@
 	<li><details>
 		<summary>書類のシンタックスを解析する</summary>
 		<ul>
-			<li><a href="pgs/howto_show_outlinemenu.html">書類のアウトラインを生成する</a></li>
+			<li><a href="pgs/howto_show_outlinemenu.html">書類のアウトラインを一覧する</a></li>
 			<li><a href="pgs/syntax_definition.html">シンタックスを定義する</a></li>
 			<li><a href="pgs/syntax_highlight_settings.html">シンタックスカラーリングを定義する</a></li>
 			<li><a href="pgs/syntax_comment_settings.html">コメント記号を定義する</a></li>