Merge pull request #2398 from noborus/fix-tag-indexterm-145

抜け、コメント内修正、タグ変更の修正

doc/src/sgml/advanced.sgml

@@ -333,7 +333,7 @@ BEGIN;
 UPDATE accounts SET balance = balance - 100.00
     WHERE name = 'Alice';
 <!--
-&#045;- etc etc
+&#45;- etc etc
 -->
 -- 等々
 COMMIT;
@@ -842,7 +842,7 @@ CREATE TABLE capitals (
   name       text,
   population real,
 <!--
-  elevation  int,    &#045;&#045; (in ft)
+  elevation  int,    &#45;- (in ft)
 -->
   elevation  int,    -- （フィート単位）
   state      char(2)
@@ -852,7 +852,7 @@ CREATE TABLE non_capitals (
   name       text,
   population real,
 <!--
-  elevation  int,    &#045;&#045; (in ft)
+  elevation  int     &#45;- (in ft)
 -->
   elevation  int     -- （フィート単位）
 );
@@ -881,7 +881,7 @@ CREATE TABLE cities (
   name       text,
   population real,
 <!--
-  elevation  int     &#045;&#045; (in ft)
+  elevation  int     &#45;- (in ft)
 -->
   elevation  int     -- （フィート単位）
 );

doc/src/sgml/brin.sgml

@@ -975,7 +975,8 @@ minmax-multi演算子クラスでは次のパラメータを受け取ります
       which has this definition:
 -->
 インデックスが貼られた列の要約データに関する内部情報を返します。
-返却値はpallocされたBrinOpcInfoへのポインタでなければなりません。BrinOpcInfoは以下の定義を持ちます。
+返却値はpallocされた<structname>BrinOpcInfo</structname>へのポインタでなければなりません。
+BrinOpcInfoは以下の定義を持ちます。
 <programlisting>
 typedef struct BrinOpcInfo
 {

doc/src/sgml/btree.sgml

@@ -8,6 +8,7 @@
 
    <indexterm>
     <primary>index</primary>
+    <secondary>B-Tree</secondary>
    </indexterm>
    <indexterm>
     <primary>インデックス</primary>

doc/src/sgml/ddl.sgml

@@ -3548,7 +3548,7 @@ CREATE POLICY user_mod_policy ON users
 
 <programlisting>
 <!--
-&#045;- Simple passwd-file based example
+&#45;- Simple passwd-file based example
 -->
 -- passwdファイルに基づく簡単な例
 CREATE TABLE passwd (
@@ -3564,17 +3564,16 @@ CREATE TABLE passwd (
 );
 
 <!--
-CREATE ROLE admin;  &#045;- Administrator
-CREATE ROLE bob;    &#045;- Normal user
-CREATE ROLE alice;  &#045;- Normal user
+CREATE ROLE admin;  &#45;- Administrator
+CREATE ROLE bob;    &#45;- Normal user
+CREATE ROLE alice;  &#45;- Normal user
 -->
 CREATE ROLE admin;  -- 管理者
 CREATE ROLE bob;    -- 一般ユーザ
 CREATE ROLE alice;  -- 一般ユーザ
 
-
 <!--
-&#045;- Populate the table
+&#45;- Populate the table
 -->
 -- テーブルに値を入れる
 INSERT INTO passwd VALUES
@@ -3585,26 +3584,26 @@ INSERT INTO passwd VALUES
   ('alice','xxx',2,1,'Alice','098-765-4321',null,'/home/alice','/bin/zsh');
 
 <!--
-&#045;- Be sure to enable row-level security on the table
+&#45;- Be sure to enable row-level security on the table
 -->
 -- テーブルの行単位セキュリティを有効にする
 ALTER TABLE passwd ENABLE ROW LEVEL SECURITY;
 
 <!--
-&#045;- Create policies
-&#045;- Administrator can see all rows and add any rows
+&#45;- Create policies
+&#45;- Administrator can see all rows and add any rows
 -->
 -- ポリシーを作成する
 -- 管理者はすべての行を見ることができ、どんな行でも追加できる
 CREATE POLICY admin_all ON passwd TO admin USING (true) WITH CHECK (true);
 <!--
-&#045;- Normal users can view all rows
+&#45;- Normal users can view all rows
 -->
 -- 一般ユーザはすべての行を見ることができる
 CREATE POLICY all_view ON passwd FOR SELECT USING (true);
 <!--
-&#045;- Normal users can update their own records, but
-&#045;- limit which shells a normal user is allowed to set
+&#45;- Normal users can update their own records, but
+&#45;- limit which shells a normal user is allowed to set
 -->
 -- 一般ユーザは自身のレコードを更新できるが、
 -- 変更できるのは使用するシェルだけに制限する
@@ -3616,19 +3615,19 @@ CREATE POLICY user_mod ON passwd FOR UPDATE
   );
 
 <!--
-&#045;- Allow admin all normal rights
+&#45;- Allow admin all normal rights
 -->
 -- adminにはすべての通常の権限を付与する
 GRANT SELECT, INSERT, UPDATE, DELETE ON passwd TO admin;
 <!--
-&#045;- Users only get select access on public columns
+&#45;- Users only get select access on public columns
 -->
 -- 一般ユーザは公開列にSELECTでアクセスできるだけとする
 GRANT SELECT
   (user_name, uid, gid, real_name, home_phone, extra_info, home_dir, shell)
   ON passwd TO public;
 <!--
-&#045;- Allow users to update certain columns
+&#45;- Allow users to update certain columns
 -->
 -- 特定の列についてはユーザによる更新を許可する
 GRANT UPDATE
@@ -3648,7 +3647,7 @@ GRANT UPDATE
 
 <programlisting>
 <!--
-&#045;- admin can view all rows and fields
+&#45;- admin can view all rows and fields
 -->
 -- adminはすべての行と列を見ることができる
 postgres=&gt; set role admin;
@@ -3680,7 +3679,7 @@ postgres=&gt; select user_name,real_name,home_phone,extra_info,home_dir,shell fr
 postgres=&gt; update passwd set user_name = 'joe';
 ERROR:  permission denied for relation passwd
 <!--
-&#045;- Alice is allowed to change her own real_name, but no others
+&#45;- Alice is allowed to change her own real_name, but no others
 -->
 -- Aliceは自分のreal_nameを変更できるが、他は変更できない
 postgres=&gt; update passwd set real_name = 'Alice Doe';
@@ -3694,7 +3693,7 @@ ERROR:  permission denied for relation passwd
 postgres=&gt; insert into passwd (user_name) values ('xxx');
 ERROR:  permission denied for relation passwd
 <!--
-&#045;- Alice can change her own password; RLS silently prevents updating other rows
+&#45;- Alice can change her own password; RLS silently prevents updating other rows
 -->
 -- Aliceは自分のパスワードを変更できる。
 -- RLSにより他の行は更新されないが、何も報告されない。
@@ -3807,7 +3806,7 @@ UPDATE 0
 
 <programlisting>
 <!--
-&#045;- definition of privilege groups
+&#45;- definition of privilege groups
 -->
 -- 権限グループの定義
 CREATE TABLE groups (group_id int PRIMARY KEY,
@@ -3819,13 +3818,13 @@ INSERT INTO groups VALUES
   (5, 'high');
 
 <!--
-GRANT ALL ON groups TO alice;  &#045;- alice is the administrator
+GRANT ALL ON groups TO alice;  &#45;- alice is the administrator
 -->
 GRANT ALL ON groups TO alice;  -- aliceが管理者
 GRANT SELECT ON groups TO public;
 
 <!--
-&#045;- definition of users' privilege levels
+&#45;- definition of users' privilege levels
 -->
 -- ユーザの権限レベルの定義
 CREATE TABLE users (user_name text PRIMARY KEY,
@@ -3840,7 +3839,7 @@ GRANT ALL ON users TO alice;
 GRANT SELECT ON users TO public;
 
 <!--
-&#045;- table holding the information to be protected
+&#45;- table holding the information to be protected
 -->
 -- 保護される情報を保持するテーブル
 CREATE TABLE information (info text,
@@ -3854,8 +3853,8 @@ INSERT INTO information VALUES
 ALTER TABLE information ENABLE ROW LEVEL SECURITY;
 
 <!--
-&#045;- a row should be visible to/updatable by users whose security group_id is
-&#045;- greater than or equal to the row's group_id
+&#45;- a row should be visible to/updatable by users whose security group_id is
+&#45;- greater than or equal to the row's group_id
 -->
 -- セキュリティのgroup_idが行のgroup_idより大きいか等しいユーザは
 -- その行を見ること、更新することが可能
@@ -3865,7 +3864,7 @@ CREATE POLICY fp_u ON information FOR UPDATE
   USING (group_id &lt;= (SELECT group_id FROM users WHERE user_name = current_user));
 
 <!--
-&#045;- we rely only on RLS to protect the information table
+&#45;- we rely only on RLS to protect the information table
 -->
 -- informationテーブルを保護するのにRLSのみに依存する
 GRANT ALL ON information TO public;
@@ -5943,7 +5942,10 @@ ALTER TABLE measurement_y2008m02 ADD CONSTRAINT y2008m02
    CHECK ( logdate &gt;= DATE '2008-02-01' AND logdate &lt; DATE '2008-03-01' );
 
 \copy measurement_y2008m02 from 'measurement_y2008m02'
--- possibly some other data preparation work
+<!--
+&#45;- possibly some other data preparation work
+-->
+-- その他のデータ準備操作を行うこともあります。
 
 ALTER TABLE measurement ATTACH PARTITION measurement_y2008m02
     FOR VALUES FROM ('2008-02-01') TO ('2008-03-01' );
@@ -6681,7 +6683,7 @@ ALTER TABLE measurement_y2008m02 ADD CONSTRAINT y2008m02
    CHECK ( logdate &gt;= DATE '2008-02-01' AND logdate &lt; DATE '2008-03-01' );
 \copy measurement_y2008m02 from 'measurement_y2008m02'
 <!--
-&#045;- possibly some other data preparation work
+&#45;- possibly some other data preparation work
 -->
 -- その他のデータ準備操作を行うこともあります。
 ALTER TABLE measurement_y2008m02 INHERIT measurement;

doc/src/sgml/dml.sgml

@@ -496,9 +496,6 @@ INSERT INTO users (firstname, lastname) VALUES ('Joe', 'Cool') RETURNING id;
 また、<literal>RETURNING</literal>句は<literal>INSERT ... SELECT</literal>でも非常に役に立ちます。
   </para>
 
-  <para>
-  </para>
-
   <para>
 <!--
    In an <command>UPDATE</command>, the data available to <literal>RETURNING</literal> is