Skip to content

Commit 0614840

Browse files
committed
Update revoke.sgml
2019.12.15更新内容。 将英文原文中</>补充相应tag
1 parent 6a7fb37 commit 0614840

File tree

1 file changed

+24
-24
lines changed

1 file changed

+24
-24
lines changed

postgresql/doc/src/sgml/ref/revoke.sgml

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -254,13 +254,13 @@ ____________________________________________________________________________-->
254254
Note that any particular role will have the sum
255255
of privileges granted directly to it, privileges granted to any role it
256256
is presently a member of, and privileges granted to
257-
<literal>PUBLIC</literal>. Thus, for example, revoking <literal>SELECT</> privilege
257+
<literal>PUBLIC</literal>. Thus, for example, revoking <literal>SELECT</literal> privilege
258258
from <literal>PUBLIC</literal> does not necessarily mean that all roles
259-
have lost <literal>SELECT</> privilege on the object: those who have it granted
259+
have lost <literal>SELECT</literal> privilege on the object: those who have it granted
260260
directly or via another role will still have it. Similarly, revoking
261-
<literal>SELECT</> from a user might not prevent that user from using
262-
<literal>SELECT</> if <literal>PUBLIC</literal> or another membership
263-
role still has <literal>SELECT</> rights.
261+
<literal>SELECT</literal> from a user might not prevent that user from using
262+
<literal>SELECT</literal> if <literal>PUBLIC</literal> or another membership
263+
role still has <literal>SELECT</literal> rights.
264264
</para>
265265
____________________________________________________________________________-->
266266
<para>
@@ -328,10 +328,10 @@ ____________________________________________________________________________-->
328328

329329
<!--==========================orignal english content==========================
330330
<para>
331-
When revoking membership in a role, <literal>GRANT OPTION</> is instead
332-
called <literal>ADMIN OPTION</>, but the behavior is similar.
331+
When revoking membership in a role, <literal>GRANT OPTION</literal> is instead
332+
called <literal>ADMIN OPTION</literal>, but the behavior is similar.
333333
Note also that this form of the command does not
334-
allow the noise word <literal>GROUP</>.
334+
allow the noise word <literal>GROUP</literal>.
335335
</para>
336336
____________________________________________________________________________-->
337337
<para>
@@ -352,7 +352,7 @@ ____________________________________________________________________________-->
352352
Use <xref linkend="app-psql">'s <command>\dp</command> command to
353353
display the privileges granted on existing tables and columns. See <xref
354354
linkend="sql-grant"> for information about the
355-
format. For non-table objects there are other <command>\d</> commands
355+
format. For non-table objects there are other <command>\d</command> commands
356356
that can display their privileges.
357357
</para>
358358
____________________________________________________________________________-->
@@ -388,12 +388,12 @@ ____________________________________________________________________________-->
388388

389389
<!--==========================orignal english content==========================
390390
<para>
391-
When a non-owner of an object attempts to <command>REVOKE</> privileges
391+
When a non-owner of an object attempts to <command>REVOKE</command> privileges
392392
on the object, the command will fail outright if the user has no
393393
privileges whatsoever on the object. As long as some privilege is
394394
available, the command will proceed, but it will revoke only those
395395
privileges for which the user has grant options. The <command>REVOKE ALL
396-
PRIVILEGES</> forms will issue a warning message if no grant options are
396+
PRIVILEGES</command> forms will issue a warning message if no grant options are
397397
held, while the other forms will issue a warning if grant options for
398398
any of the privileges specifically named in the command are not held.
399399
(In principle these statements apply to the object owner as well, but
@@ -413,7 +413,7 @@ ____________________________________________________________________________-->
413413

414414
<!--==========================orignal english content==========================
415415
<para>
416-
If a superuser chooses to issue a <command>GRANT</> or <command>REVOKE</>
416+
If a superuser chooses to issue a <command>GRANT</command> or <command>REVOKE</command>
417417
command, the command is performed as though it were issued by the
418418
owner of the affected object. Since all privileges ultimately come
419419
from the object owner (possibly indirectly via chains of grant options),
@@ -431,18 +431,18 @@ ____________________________________________________________________________-->
431431

432432
<!--==========================orignal english content==========================
433433
<para>
434-
<command>REVOKE</> can also be done by a role
434+
<command>REVOKE</command> can also be done by a role
435435
that is not the owner of the affected object, but is a member of the role
436436
that owns the object, or is a member of a role that holds privileges
437437
<literal>WITH GRANT OPTION</literal> on the object. In this case the
438438
command is performed as though it were issued by the containing role that
439439
actually owns the object or holds the privileges
440440
<literal>WITH GRANT OPTION</literal>. For example, if table
441-
<literal>t1</> is owned by role <literal>g1</>, of which role
442-
<literal>u1</> is a member, then <literal>u1</> can revoke privileges
443-
on <literal>t1</> that are recorded as being granted by <literal>g1</>.
444-
This would include grants made by <literal>u1</> as well as by other
445-
members of role <literal>g1</>.
441+
<literal>t1</literal> is owned by role <literal>g1</literal>, of which role
442+
<literal>u1</literal> is a member, then <literal>u1</literal> can revoke privileges
443+
on <literal>t1</literal> that are recorded as being granted by <literal>g1</literal>.
444+
This would include grants made by <literal>u1</literal> as well as by other
445+
members of role <literal>g1</literal>.
446446
</para>
447447
____________________________________________________________________________-->
448448
<para>
@@ -459,11 +459,11 @@ ____________________________________________________________________________-->
459459

460460
<!--==========================orignal english content==========================
461461
<para>
462-
If the role executing <command>REVOKE</> holds privileges
462+
If the role executing <command>REVOKE</command> holds privileges
463463
indirectly via more than one role membership path, it is unspecified
464464
which containing role will be used to perform the command. In such cases
465-
it is best practice to use <command>SET ROLE</> to become the specific
466-
role you want to do the <command>REVOKE</> as. Failure to do so might
465+
it is best practice to use <command>SET ROLE</command> to become the specific
466+
role you want to do the <command>REVOKE</command> as. Failure to do so might
467467
lead to revoking privileges other than the ones you intended, or not
468468
revoking anything at all.
469469
</para>
@@ -512,7 +512,7 @@ REVOKE ALL PRIVILEGES ON kinds FROM manuel;
512512
</programlisting>
513513

514514
Note that this actually means <quote>revoke all privileges that I
515-
granted</>.
515+
granted</quote>.
516516
</para>
517517
____________________________________________________________________________-->
518518
<para>
@@ -528,7 +528,7 @@ REVOKE ALL PRIVILEGES ON kinds FROM manuel;
528528

529529
<!--==========================orignal english content==========================
530530
<para>
531-
Revoke membership in role <literal>admins</> from user <literal>joe</>:
531+
Revoke membership in role <literal>admins</literal> from user <literal>joe</literal>:
532532

533533
<programlisting>
534534
REVOKE admins FROM joe;
@@ -553,7 +553,7 @@ ____________________________________________________________________________-->
553553
The compatibility notes of the <xref linkend="sql-grant"> command
554554
apply analogously to <command>REVOKE</command>.
555555
The keyword <literal>RESTRICT</literal> or <literal>CASCADE</literal>
556-
is required according to the standard, but <productname>PostgreSQL</>
556+
is required according to the standard, but <productname>PostgreSQL</productname>
557557
assumes <literal>RESTRICT</literal> by default.
558558
</para>
559559
____________________________________________________________________________-->

0 commit comments

Comments
 (0)