Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit741ccd5

Browse files
committed
Use gender-neutral language in documentation
Based on patch by Thomas Munro <thomas.munro@enterprisedb.com>, althoughI rephrased most of the initial work.
1 parent1320077 commit741ccd5

20 files changed

+57
-58
lines changed

‎doc/src/sgml/catalogs.sgml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9274,7 +9274,7 @@ SELECT * FROM pg_locks pl LEFT JOIN pg_prepared_xacts ppx
92749274
<filename>postgresql.conf</filename> without restarting the server.
92759275
They can also be set for a particular session in the connection request
92769276
packet (for example, via <application>libpq</>'s <literal>PGOPTIONS</>
9277-
environment variable); any user can make such a change forhis session.
9277+
environment variable); any user can make such a change fortheir session.
92789278
However, these settings never change in a session after it is started.
92799279
If you change them in <filename>postgresql.conf</filename>, send a
92809280
<systemitem>SIGHUP</systemitem> signal to the postmaster to cause it to
@@ -9303,7 +9303,7 @@ SELECT * FROM pg_locks pl LEFT JOIN pg_prepared_xacts ppx
93039303
<para>
93049304
These settings can be set from <filename>postgresql.conf</filename>,
93059305
or within a session via the <command>SET</> command. Any user is
9306-
allowed to changehis session-local value. Changes in
9306+
allowed to changetheir session-local value. Changes in
93079307
<filename>postgresql.conf</filename> will affect existing sessions
93089308
only if no session-local value has been established with <command>SET</>.
93099309
</para>

‎doc/src/sgml/client-auth.sgml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -690,9 +690,9 @@ local db1,db2,@demodbs all md5
690690
</indexterm>
691691

692692
<para>
693-
When using an external authentication systemlike Ident or GSSAPI,
693+
When using an external authentication systemsuch as Ident or GSSAPI,
694694
the name of the operating system user that initiated the connection
695-
might not be the same as the database userhe needs to connect as.
695+
might not be the same as the database userthat is to be connect as.
696696
In this case, a user name map can be applied to map the operating system
697697
user name to a database user. To use user name mapping, specify
698698
<literal>map</literal>=<replaceable>map-name</replaceable>
@@ -1185,7 +1185,7 @@ omicron bryanh guest1
11851185
The drawback of this procedure is that it depends on the integrity
11861186
of the client: if the client machine is untrusted or compromised,
11871187
an attacker could run just about any program on port 113 and
1188-
return any user namehe chooses. This authentication method is
1188+
return any user namethey choose. This authentication method is
11891189
therefore only appropriate for closed networks where each client
11901190
machine is under tight control and where the database and system
11911191
administrators operate in close contact. In other words, you must

‎doc/src/sgml/ddl.sgml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1492,8 +1492,8 @@ REVOKE ALL ON accounts FROM PUBLIC;
14921492
<command>DROP</>, <command>GRANT</>, <command>REVOKE</>, etc.)
14931493
are always implicit in being the owner,
14941494
and cannot be granted or revoked. But the object owner can choose
1495-
to revokehis own ordinary privileges, for example to make a
1496-
table read-only forhimself as well as others.
1495+
to revoketheir own ordinary privileges, for example to make a
1496+
table read-only forthemselves as well as others.
14971497
</para>
14981498

14991499
<para>
@@ -1816,7 +1816,7 @@ UPDATE 1
18161816
example, both <literal>schema1</> and <literal>myschema</> can
18171817
contain tables named <literal>mytable</>. Unlike databases,
18181818
schemas are not rigidly separated: a user can access objects in any
1819-
of the schemas in the databasehe is connected to, ifhe has
1819+
of the schemas in the databasethey are connected to, ifthey have
18201820
privileges to do so.
18211821
</para>
18221822

‎doc/src/sgml/manage-ag.sgml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -155,9 +155,9 @@ createdb <replaceable class="parameter">dbname</replaceable>
155155
</note>
156156

157157
<para>
158-
Sometimes you want to create a database for someone else, and havehim
159-
become the owner of the new database, sohe can
160-
configure and manage ithimself. To achieve that, use one of the
158+
Sometimes you want to create a database for someone else, and havethem
159+
become the owner of the new database, sothey can
160+
configure and manage itthemselves. To achieve that, use one of the
161161
following commands:
162162
<programlisting>
163163
CREATE DATABASE <replaceable>dbname</> OWNER <replaceable>rolename</>;

‎doc/src/sgml/nls.sgml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ msgstr "another translated"
115115
for the translator, such as about expected alignment. The #:
116116
comment indicates the exact location(s) where the message is used
117117
in the source. The translator need not look at the program
118-
source, buthecan if there is doubt about the correct
118+
source, but can if there is doubt about the correct
119119
translation. The #, comments contain flags that describe the
120120
message in some way. There are currently two flags:
121121
<literal>fuzzy</literal> is set if the message has possibly been

‎doc/src/sgml/plpgsql.sgml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3904,7 +3904,7 @@ CREATE FUNCTION emp_stamp() RETURNS trigger AS $emp_stamp$
39043904
RAISE EXCEPTION '% cannot have null salary', NEW.empname;
39053905
END IF;
39063906

3907-
-- Who works for us whenshe must pay for it?
3907+
-- Who works for us whenthey must pay for it?
39083908
IF NEW.salary &lt; 0 THEN
39093909
RAISE EXCEPTION '% cannot have a negative salary', NEW.empname;
39103910
END IF;

‎doc/src/sgml/ref/alter_user_mapping.sgml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ ALTER USER MAPPING FOR { <replaceable class="parameter">user_name</replaceable>
3838
<para>
3939
The owner of a foreign server can alter user mappings for that
4040
server for any user. Also, a user can alter a user mapping for
41-
his own user name if <literal>USAGE</> privilege on the server has
41+
their own user name if <literal>USAGE</> privilege on the server has
4242
been granted to the user.
4343
</para>
4444
</refsect1>

‎doc/src/sgml/ref/create_schema.sgml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,7 @@ CREATE VIEW hollywood.winners AS
205205
all objects within it. <productname>PostgreSQL</productname>
206206
allows schemas to contain objects owned by users other than the
207207
schema owner. This can happen only if the schema owner grants the
208-
<literal>CREATE</> privilege onhis schema to someone else, or a
208+
<literal>CREATE</> privilege ontheir schema to someone else, or a
209209
superuser chooses to create objects in it.
210210
</para>
211211

‎doc/src/sgml/ref/create_user_mapping.sgml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ CREATE USER MAPPING FOR { <replaceable class="parameter">user_name</replaceable>
4141
<para>
4242
The owner of a foreign server can create user mappings for that
4343
server for any user. Also, a user can create a user mapping for
44-
his own user name if <literal>USAGE</> privilege on the server has
44+
their own user name if <literal>USAGE</> privilege on the server has
4545
been granted to the user.
4646
</para>
4747
</refsect1>

‎doc/src/sgml/ref/drop_schema.sgml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ DROP SCHEMA [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceable> [, .
3535
<para>
3636
A schema can only be dropped by its owner or a superuser. Note that
3737
the owner can drop the schema (and thereby all contained objects)
38-
even ifhe does not own some of the objects within the schema.
38+
even ifthey do not own some of the objects within the schema.
3939
</para>
4040
</refsect1>
4141

‎doc/src/sgml/ref/drop_user_mapping.sgml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ DROP USER MAPPING [ IF EXISTS ] FOR { <replaceable class="parameter">user_name</
3535

3636
<para>
3737
The owner of a foreign server can drop user mappings for that server
38-
for any user. Also, a user can drop a user mapping forhis own
38+
for any user. Also, a user can drop a user mapping fortheir own
3939
user name if <literal>USAGE</> privilege on the server has been
4040
granted to the user.
4141
</para>

‎doc/src/sgml/ref/grant.sgml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ GRANT <replaceable class="PARAMETER">role_name</replaceable> [, ...] TO <replace
141141
There is no need to grant privileges to the owner of an object
142142
(usually the user that created it),
143143
as the owner has all privileges by default. (The owner could,
144-
however, choose to revoke some ofhis own privileges for safety.)
144+
however, choose to revoke some oftheir own privileges for safety.)
145145
</para>
146146

147147
<para>
@@ -365,7 +365,7 @@ GRANT <replaceable class="PARAMETER">role_name</replaceable> [, ...] TO <replace
365365
</para>
366366
<para>
367367
For servers, this privilege enables the grantee to create foreign
368-
tables using the server, and also to create, alter, or drophis own
368+
tables using the server, and also to create, alter, or droptheir own
369369
user's user mappings associated with that server.
370370
</para>
371371
</listitem>
@@ -438,9 +438,9 @@ GRANT <replaceable class="PARAMETER">role_name</replaceable> [, ...] TO <replace
438438

439439
<para>
440440
A user may perform <command>SELECT</>, <command>INSERT</>, etc. on a
441-
column ifhe holds that privilege for either the specific column or
441+
column ifthey hold that privilege for either the specific column or
442442
its whole table. Granting the privilege at the table level and then
443-
revoking it for one column will not do whatyou might wish: the
443+
revoking it for one column will not do whatone might wish: the
444444
table-level grant is unaffected by a column-level operation.
445445
</para>
446446

@@ -626,13 +626,13 @@ GRANT admins TO joe;
626626
</para>
627627

628628
<para>
629-
<productname>PostgreSQL</productname> allows an object owner to revokehis
629+
<productname>PostgreSQL</productname> allows an object owner to revoketheir
630630
own ordinary privileges: for example, a table owner can make the table
631-
read-only tohimself by revokinghis own <literal>INSERT</>,
631+
read-only tothemselves by revokingtheir own <literal>INSERT</>,
632632
<literal>UPDATE</>, <literal>DELETE</>, and <literal>TRUNCATE</>
633633
privileges. This is not possible according to the SQL standard. The
634634
reason is that <productname>PostgreSQL</productname> treats the owner's
635-
privileges as having been granted by the owner tohimself; thereforehe
635+
privileges as having been granted by the owner tothemselves; thereforethey
636636
can revoke them too. In the SQL standard, the owner's privileges are
637637
granted by an assumed entity <quote>_SYSTEM</>. Not being
638638
<quote>_SYSTEM</>, the owner cannot revoke these rights.

‎doc/src/sgml/ref/revoke.sgml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,7 @@ REVOKE [ ADMIN OPTION FOR ]
193193
Instead, user A could revoke the grant option from user B and use
194194
the <literal>CASCADE</literal> option so that the privilege is
195195
in turn revoked from user C. For another example, if both A and B
196-
have granted the same privilege to C, A can revokehis own grant
196+
have granted the same privilege to C, A can revoketheir own grant
197197
but not B's grant, so C will still effectively have the privilege.
198198
</para>
199199

‎doc/src/sgml/ref/set_role.sgml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ RESET ROLE
7777

7878
<para>
7979
In particular, when a superuser chooses to <command>SET ROLE</> to a
80-
non-superuser role,she loses her superuser privileges.
80+
non-superuser role,they lose their superuser privileges.
8181
</para>
8282

8383
<para>

‎doc/src/sgml/rules.sgml

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1652,7 +1652,7 @@ CREATE RULE shoelace_ins AS ON INSERT TO shoelace
16521652
Now assume that once in a while, a pack of shoelaces arrives at
16531653
the shop and a big parts list along with it. But you don't want
16541654
to manually update the <literal>shoelace</literal> view every
1655-
time. Instead wesetup two little tables: one where you can
1655+
time. Instead weset up two little tables: one where you can
16561656
insert the items from the part list, and one with a special
16571657
trick. The creation commands for these are:
16581658

@@ -2023,57 +2023,57 @@ SELECT * FROM shoelace;
20232023
behavior of the default access control system. Relations that
20242024
are used due to rules get checked against the
20252025
privileges of the rule owner, not the user invoking the rule.
2026-
This means thata useronlyneeds the required privileges
2027-
for the tables/views thathe namesexplicitly inhis queries.
2026+
This means thatusersonlyneed the required privileges
2027+
for the tables/views thatareexplicitlynamedintheir queries.
20282028
</para>
20292029

20302030
<para>
20312031
For example: A user has a list of phone numbers where some of
2032-
them are private, the others are of interest for thesecretary of the office.
2033-
He can construct the following:
2032+
them are private, the others are of interest for theassistant of the office.
2033+
The user can construct the following:
20342034

20352035
<programlisting>
20362036
CREATE TABLE phone_data (person text, phone text, private boolean);
20372037
CREATE VIEW phone_number AS
20382038
SELECT person, CASE WHEN NOT private THEN phone END AS phone
20392039
FROM phone_data;
2040-
GRANT SELECT ON phone_number TOsecretary;
2040+
GRANT SELECT ON phone_number TOassistant;
20412041
</programlisting>
20422042

2043-
Nobody excepthim (and the database superusers) can access the
2043+
Nobody exceptthat user (and the database superusers) can access the
20442044
<literal>phone_data</> table. But because of the <command>GRANT</>,
2045-
thesecretary can run a <command>SELECT</command> on the
2045+
theassistant can run a <command>SELECT</command> on the
20462046
<literal>phone_number</> view. The rule system will rewrite the
20472047
<command>SELECT</command> from <literal>phone_number</> into a
20482048
<command>SELECT</command> from <literal>phone_data</>.
20492049
Since the user is the owner of
20502050
<literal>phone_number</> and therefore the owner of the rule, the
2051-
read access to <literal>phone_data</> is now checked againsthis
2051+
read access to <literal>phone_data</> is now checked againstthe user's
20522052
privileges and the query is permitted. The check for accessing
20532053
<literal>phone_number</> is also performed, but this is done
20542054
against the invoking user, so nobody but the user and the
2055-
secretary can use it.
2055+
assistant can use it.
20562056
</para>
20572057

20582058
<para>
2059-
The privileges are checked rule by rule. So thesecretary is for now the
2060-
only one who can see the public phone numbers. But thesecretary cansetup
2059+
The privileges are checked rule by rule. So theassistant is for now the
2060+
only one who can see the public phone numbers. But theassistant canset up
20612061
another view and grant access to that to the public. Then, anyone
2062-
can see the <literal>phone_number</> data through thesecretary's view.
2063-
What thesecretary cannot do is to create a view that directly
2064-
accesses <literal>phone_data</>. (Actuallyhe can, but it will not work since
2062+
can see the <literal>phone_number</> data through theassistant's view.
2063+
What theassistant cannot do is to create a view that directly
2064+
accesses <literal>phone_data</>. (Actuallythe assistant can, but it will not work since
20652065
every access will be denied during the permission checks.)
2066-
And as soon as the userwill notice,that thesecretary opened
2067-
his <literal>phone_number</> view,hecan revokehis access. Immediately, any
2068-
access to thesecretary's view would fail.
2066+
And as soon as the usernoticesthat theassistant opened
2067+
their <literal>phone_number</> view,the usercan revokethe assistant's access. Immediately, any
2068+
access to theassistant's view would fail.
20692069
</para>
20702070

20712071
<para>
20722072
One might think that this rule-by-rule checking is a security
2073-
hole, but in fact it isn't. But if it did not work this way, thesecretary
2073+
hole, but in fact it isn't. But if it did not work this way, theassistant
20742074
could set up a table with the same columns as <literal>phone_number</> and
2075-
copy the data to there once per day. Then it'shis own data and
2076-
hecan grant access to everyonehe wants. A
2075+
copy the data to there once per day. Then it'sthe assistant's own data and
2076+
the assistantcan grant access to everyonethey want. A
20772077
<command>GRANT</command> command means, <quote>I trust you</quote>.
20782078
If someone you trust does the thing above, it's time to
20792079
think it over and then use <command>REVOKE</command>.
@@ -2093,7 +2093,7 @@ CREATE VIEW phone_number AS
20932093
<command>SELECT</command> from <literal>phone_number</> into a
20942094
<command>SELECT</command> from <literal>phone_data</> and add the
20952095
qualification that only entries where <literal>phone</> does not begin
2096-
with 412 are wanted. But if the user can createhis or her own functions,
2096+
with 412 are wanted. But if the user can createtheir own functions,
20972097
it is not difficult to convince the planner to execute the user-defined
20982098
function prior to the <function>NOT LIKE</function> expression.
20992099
For example:
@@ -2124,8 +2124,8 @@ SELECT * FROM phone_number WHERE tricky(person, phone);
21242124
the <literal>shoelace</> view to someone else, but only
21252125
<literal>SELECT</> on <literal>shoelace_log</>. The rule action to
21262126
write log entries will still be executed successfully, and that
2127-
other user could see the log entries. Buthe cannot create fake
2128-
entries, nor couldhe manipulate or remove existing ones. In this
2127+
other user could see the log entries. Butthey could not create fake
2128+
entries, nor couldthey manipulate or remove existing ones. In this
21292129
case, there is no possibility of subverting the rules by convincing
21302130
the planner to alter the order of operations, because the only rule
21312131
which references <literal>shoelace_log</> is an unqualified
@@ -2333,7 +2333,7 @@ DELETE FROM software WHERE computer.hostname = 'mypc.local.net'
23332333
AND software.hostname = computer.hostname;
23342334
</programlisting>
23352335

2336-
Since there are appropriate indexessetup, the planner
2336+
Since there are appropriate indexesset up, the planner
23372337
will create a plan of
23382338

23392339
<literallayout class="monospaced">

‎doc/src/sgml/sepgsql.sgml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -570,7 +570,7 @@ postgres=# SELECT cid, cname, show_credit(cid) FROM customer;
570570

571571
<para>
572572
In this case, a regular user cannot reference <literal>customer.credit</>
573-
directly, but a trusted procedure <literal>show_credit</> allowshim
573+
directly, but a trusted procedure <literal>show_credit</> allowsthe user
574574
to print the credit card numbers of customers with some of the digits
575575
masked out.
576576
</para>

‎doc/src/sgml/sslinfo.sgml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@
9696
Returns serial number of current client certificate. The combination of
9797
certificate serial number and certificate issuer is guaranteed to
9898
uniquely identify a certificate (but not its owner &mdash; the owner
99-
ought to regularly changehis keys, and get new certificates from the
99+
ought to regularly changetheir keys, and get new certificates from the
100100
issuer).
101101
</para>
102102

‎doc/src/sgml/start.sgml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -143,8 +143,7 @@
143143

144144
<para>
145145
Possibly, your site administrator has already created a database
146-
for your use. He should have told you what the name of your
147-
database is. In that case you can omit this step and skip ahead
146+
for your use. In that case you can omit this step and skip ahead
148147
to the next section.
149148
</para>
150149

‎doc/src/sgml/user-manag.sgml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ SELECT rolname FROM pg_roles;
129129
<xref linkend="client-authentication">. (Thus, a client is not
130130
limited to connect as the role matching
131131
its operating system user, just as a person's login name
132-
need not match her real name.) Since the role
132+
need not matchhis orher real name.) Since the role
133133
identity determines the set of privileges available to a connected
134134
client, it is important to carefully configure privileges when setting up
135135
a multiuser environment.

‎doc/src/sgml/xplang.sgml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
<literal>template1</> will be copied by <command>CREATE DATABASE</>.
5050
So the database administrator can
5151
decide which languages are available in which databases and can make
52-
some languages available by default ifhe chooses.
52+
some languages available by default ifdesired.
5353
</para>
5454

5555
<para>

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp