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

Commite81c138

Browse files
committed
Update reference documentation on may/can/might:
Standard English uses "may", "can", and "might" in different ways: may - permission, "You may borrow my rake." can - ability, "I can lift that log." might - possibility, "It might rain today."Unfortunately, in conversational English, their use is often mixed, asin, "You may use this variable to do X", when in fact, "can" is a betterchoice. Similarly, "It may crash" is better stated, "It might crash".
1 parentbc799fa commite81c138

File tree

71 files changed

+301
-301
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

71 files changed

+301
-301
lines changed

‎doc/src/sgml/ref/alter_domain.sgml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!--
2-
$PostgreSQL: pgsql/doc/src/sgml/ref/alter_domain.sgml,v 1.20 2006/09/16 00:30:16 momjian Exp $
2+
$PostgreSQL: pgsql/doc/src/sgml/ref/alter_domain.sgml,v 1.21 2007/01/31 23:26:02 momjian Exp $
33
PostgreSQL documentation
44
-->
55

@@ -64,7 +64,7 @@ ALTER DOMAIN <replaceable class="PARAMETER">name</replaceable>
6464
<listitem>
6565
<para>
6666
These forms change whether a domain is marked to allow NULL
67-
values or to reject NULL values. Youmay only <literal>SET NOT NULL</>
67+
values or to reject NULL values. Youcan only <literal>SET NOT NULL</>
6868
when the columns using the domain contain no null values.
6969
</para>
7070
</listitem>

‎doc/src/sgml/ref/alter_index.sgml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!--
2-
$PostgreSQL: pgsql/doc/src/sgml/ref/alter_index.sgml,v 1.11 2006/09/16 00:30:16 momjian Exp $
2+
$PostgreSQL: pgsql/doc/src/sgml/ref/alter_index.sgml,v 1.12 2007/01/31 23:26:02 momjian Exp $
33
PostgreSQL documentation
44
-->
55

@@ -67,7 +67,7 @@ ALTER INDEX <replaceable class="PARAMETER">name</replaceable> RESET ( <replaceab
6767
<xref linkend="SQL-CREATEINDEX" endterm="sql-createindex-title">
6868
for details on the available parameters. Note that the index contents
6969
will not be modified immediately by this command; depending on the
70-
parameter youmay need to rebuild the index with
70+
parameter youmight need to rebuild the index with
7171
<xref linkend="SQL-REINDEX" endterm="sql-reindex-title">
7272
to get the desired effects.
7373
</para>
@@ -80,7 +80,7 @@ ALTER INDEX <replaceable class="PARAMETER">name</replaceable> RESET ( <replaceab
8080
<para>
8181
This form resets one or more index-method-specific storage parameters to
8282
their defaults. As with <literal>SET</>, a <literal>REINDEX</literal>
83-
may be needed to update the index entirely.
83+
might be needed to update the index entirely.
8484
</para>
8585
</listitem>
8686
</varlistentry>

‎doc/src/sgml/ref/alter_opfamily.sgml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!--
2-
$PostgreSQL: pgsql/doc/src/sgml/ref/alter_opfamily.sgml,v 1.1 2007/01/23 05:07:17 tgl Exp $
2+
$PostgreSQL: pgsql/doc/src/sgml/ref/alter_opfamily.sgml,v 1.2 2007/01/31 23:26:02 momjian Exp $
33
PostgreSQL documentation
44
-->
55

@@ -202,7 +202,7 @@ ALTER OPERATOR FAMILY <replaceable>name</replaceable> USING <replaceable class="
202202

203203
<para>
204204
The <literal>OPERATOR</> and <literal>FUNCTION</>
205-
clausesmay appear in any order.
205+
clausescan appear in any order.
206206
</para>
207207

208208
</refsect1>
@@ -216,7 +216,7 @@ ALTER OPERATOR FAMILY <replaceable>name</replaceable> USING <replaceable class="
216216
type(s). The name of the operator or function occupying the slot is not
217217
mentioned. Also, for <literal>DROP FUNCTION</> the type(s) to specify
218218
are the input data type(s) the function is intended to support; for
219-
GIN and GiST indexes thismay have nothing to do with the actual input
219+
GIN and GiST indexes thismight have nothing to do with the actual input
220220
argument types of the function.
221221
</para>
222222

‎doc/src/sgml/ref/alter_sequence.sgml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!--
2-
$PostgreSQL: pgsql/doc/src/sgml/ref/alter_sequence.sgml,v 1.15 2006/09/16 00:30:16 momjian Exp $
2+
$PostgreSQL: pgsql/doc/src/sgml/ref/alter_sequence.sgml,v 1.16 2007/01/31 23:26:02 momjian Exp $
33
PostgreSQL documentation
44
-->
55

@@ -136,7 +136,7 @@ ALTER SEQUENCE <replaceable class="parameter">name</replaceable> SET SCHEMA <rep
136136
<term><literal>CYCLE</literal></term>
137137
<listitem>
138138
<para>
139-
The optional <literal>CYCLE</literal> key wordmay be used to enable
139+
The optional <literal>CYCLE</literal> key wordcan be used to enable
140140
the sequence to wrap around when the
141141
<replaceable class="parameter">maxvalue</replaceable> or
142142
<replaceable class="parameter">minvalue</replaceable> has been

‎doc/src/sgml/ref/alter_table.sgml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!--
2-
$PostgreSQL: pgsql/doc/src/sgml/ref/alter_table.sgml,v 1.92 2006/10/23 18:10:32 petere Exp $
2+
$PostgreSQL: pgsql/doc/src/sgml/ref/alter_table.sgml,v 1.93 2007/01/31 23:26:02 momjian Exp $
33
PostgreSQL documentation
44
-->
55

@@ -110,7 +110,7 @@ where <replaceable class="PARAMETER">action</replaceable> is one of:
110110
These forms set or remove the default value for a column.
111111
The default values only apply to subsequent <command>INSERT</command>
112112
commands; they do not cause rows already in the table to change.
113-
Defaultsmay also be created for views, in which case they are
113+
Defaultscan also be created for views, in which case they are
114114
inserted into <command>INSERT</> statements on the view before
115115
the view's <literal>ON INSERT</literal> rule is applied.
116116
</para>
@@ -200,7 +200,7 @@ where <replaceable class="PARAMETER">action</replaceable> is one of:
200200
A disabled trigger is still known to the system, but is not executed
201201
when its triggering event occurs. For a deferred trigger, the enable
202202
status is checked when the event occurs, not when the trigger function
203-
is actually executed. Onemay disable or enable a single
203+
is actually executed. Onecan disable or enable a single
204204
trigger specified by name, or all triggers on the table, or only
205205
user triggers (this option excludes triggers that are used to implement
206206
foreign key constraints). Disabling or enabling constraint triggers
@@ -261,7 +261,7 @@ where <replaceable class="PARAMETER">action</replaceable> is one of:
261261
<xref linkend="SQL-CREATETABLE" endterm="sql-createtable-title">
262262
for details on the available parameters. Note that the table contents
263263
will not be modified immediately by this command; depending on the
264-
parameter youmay need to rewrite the table to get the desired effects.
264+
parameter youmight need to rewrite the table to get the desired effects.
265265
That can be done with <xref linkend="SQL-CLUSTER"
266266
endterm="sql-cluster-title"> or one of the forms of <command>ALTER
267267
TABLE</> that forces a table rewrite.
@@ -284,7 +284,7 @@ where <replaceable class="PARAMETER">action</replaceable> is one of:
284284
<listitem>
285285
<para>
286286
This form resets one or more storage parameters to their
287-
defaults. As with <literal>SET</>, a table rewritemay be
287+
defaults. As with <literal>SET</>, a table rewritemight be
288288
needed to update the table entirely.
289289
</para>
290290
</listitem>
@@ -309,7 +309,7 @@ where <replaceable class="PARAMETER">action</replaceable> is one of:
309309
<literal>CHECK</literal> constraints of the parent. Currently
310310
<literal>UNIQUE</literal>, <literal>PRIMARY KEY</literal>, and
311311
<literal>FOREIGN KEY</literal> constraints are not considered, but
312-
thismay change in the future.
312+
thismight change in the future.
313313
</para>
314314
</listitem>
315315
</varlistentry>
@@ -607,7 +607,7 @@ where <replaceable class="PARAMETER">action</replaceable> is one of:
607607
<para>
608608
Adding a column with a non-null default or changing the type of an
609609
existing column will require the entire table to be rewritten. This
610-
may take a significant amount of time for a large table; and it will
610+
might take a significant amount of time for a large table; and it will
611611
temporarily require double the disk space.
612612
</para>
613613

@@ -656,7 +656,7 @@ ALTER TABLE table ALTER COLUMN anycol TYPE anytype;
656656
expression is not applied to the column's default value (if any); the
657657
result might not be a constant expression as required for a default.
658658
This means that when there is no implicit or assignment cast from old to
659-
new type, <literal>ALTER TYPE</>may fail to convert the default even
659+
new type, <literal>ALTER TYPE</>might fail to convert the default even
660660
though a <literal>USING</literal> clause is supplied. In such cases,
661661
drop the default with <literal>DROP DEFAULT</>, perform the <literal>ALTER
662662
TYPE</>, and then use <literal>SET DEFAULT</> to add a suitable new

‎doc/src/sgml/ref/analyze.sgml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!--
2-
$PostgreSQL: pgsql/doc/src/sgml/ref/analyze.sgml,v 1.20 2006/09/16 00:30:16 momjian Exp $
2+
$PostgreSQL: pgsql/doc/src/sgml/ref/analyze.sgml,v 1.21 2007/01/31 23:26:02 momjian Exp $
33
PostgreSQL documentation
44
-->
55

@@ -109,7 +109,7 @@ ANALYZE [ VERBOSE ] [ <replaceable class="PARAMETER">table</replaceable> [ (<rep
109109
The statistics collected by <command>ANALYZE</command> usually
110110
include a list of some of the most common values in each column and
111111
a histogram showing the approximate data distribution in each
112-
column. One or both of thesemay be omitted if
112+
column. One or both of thesecan be omitted if
113113
<command>ANALYZE</command> deems them uninteresting (for example,
114114
in a unique-key column, there are no common values) or if the
115115
column data type does not support the appropriate operators. There
@@ -123,7 +123,7 @@ ANALYZE [ VERBOSE ] [ <replaceable class="PARAMETER">table</replaceable> [ (<rep
123123
allows even very large tables to be analyzed in a small amount of
124124
time. Note, however, that the statistics are only approximate, and
125125
will change slightly each time <command>ANALYZE</command> is run,
126-
even if the actual table contents did not change. Thismay result
126+
even if the actual table contents did not change. Thismight result
127127
in small changes in the planner's estimated costs shown by
128128
<command>EXPLAIN</command>. In rare situations, this
129129
non-determinism will cause the query optimizer to choose a
@@ -146,7 +146,7 @@ ANALYZE [ VERBOSE ] [ <replaceable class="PARAMETER">table</replaceable> [ (<rep
146146
<command>ANALYZE</command> and the amount of space occupied in
147147
<literal>pg_statistic</literal>. In particular, setting the
148148
statistics target to zero disables collection of statistics for
149-
that column. Itmay be useful to do that for columns that are
149+
that column. Itmight be useful to do that for columns that are
150150
never used as part of the <literal>WHERE</>, <literal>GROUP BY</>,
151151
or <literal>ORDER BY</> clauses of queries, since the planner will
152152
have no use for statistics on such columns.

‎doc/src/sgml/ref/begin.sgml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!--
2-
$PostgreSQL: pgsql/doc/src/sgml/ref/begin.sgml,v 1.34 2006/09/16 00:30:17 momjian Exp $
2+
$PostgreSQL: pgsql/doc/src/sgml/ref/begin.sgml,v 1.35 2007/01/31 23:26:02 momjian Exp $
33
PostgreSQL documentation
44
-->
55

@@ -109,7 +109,7 @@ where <replaceable class="parameter">transaction_mode</replaceable> is one of:
109109

110110
<para>
111111
For reasons of backwards compatibility, the commas between successive
112-
<replaceable class="parameter">transaction_modes</replaceable>may be
112+
<replaceable class="parameter">transaction_modes</replaceable>can be
113113
omitted.
114114
</para>
115115
</refsect1>

‎doc/src/sgml/ref/checkpoint.sgml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<!-- $PostgreSQL: pgsql/doc/src/sgml/ref/checkpoint.sgml,v 1.14 2006/09/16 00:30:17 momjian Exp $ -->
1+
<!-- $PostgreSQL: pgsql/doc/src/sgml/ref/checkpoint.sgml,v 1.15 2007/01/31 23:26:02 momjian Exp $ -->
22

33
<refentry id="sql-checkpoint">
44
<refmeta>
@@ -42,7 +42,7 @@ CHECKPOINT
4242
</para>
4343

4444
<para>
45-
Only superusersmay call <command>CHECKPOINT</command>. The command is
45+
Only superuserscan call <command>CHECKPOINT</command>. The command is
4646
not intended for use during normal operation.
4747
</para>
4848
</refsect1>

‎doc/src/sgml/ref/cluster.sgml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!--
2-
$PostgreSQL: pgsql/doc/src/sgml/ref/cluster.sgml,v 1.38 2006/11/04 19:03:51 tgl Exp $
2+
$PostgreSQL: pgsql/doc/src/sgml/ref/cluster.sgml,v 1.39 2007/01/31 23:26:02 momjian Exp $
33
PostgreSQL documentation
44
-->
55

@@ -132,7 +132,7 @@ CLUSTER
132132
Because the planner records statistics about the ordering of
133133
tables, it is advisable to run <xref linkend="sql-analyze"
134134
endterm="sql-analyze-title"> on the newly clustered table.
135-
Otherwise, the plannermay make poor choices of query plans.
135+
Otherwise, the plannermight make poor choices of query plans.
136136
</para>
137137

138138
<para>

‎doc/src/sgml/ref/comment.sgml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!--
2-
$PostgreSQL: pgsql/doc/src/sgml/ref/comment.sgml,v 1.34 2007/01/23 05:07:17 tgl Exp $
2+
$PostgreSQL: pgsql/doc/src/sgml/ref/comment.sgml,v 1.35 2007/01/31 23:26:03 momjian Exp $
33
PostgreSQL documentation
44
-->
55

@@ -93,7 +93,7 @@ COMMENT ON
9393
<para>
9494
The name of the object to be commented. Names of tables,
9595
aggregates, domains, functions, indexes, operators, operator classes,
96-
operator families, sequences, types, and viewsmay be schema-qualified.
96+
operator families, sequences, types, and viewscan be schema-qualified.
9797
</para>
9898
</listitem>
9999
</varlistentry>

‎doc/src/sgml/ref/copy.sgml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!--
2-
$PostgreSQL: pgsql/doc/src/sgml/ref/copy.sgml,v 1.77 2006/09/18 19:54:01 tgl Exp $
2+
$PostgreSQL: pgsql/doc/src/sgml/ref/copy.sgml,v 1.78 2007/01/31 23:26:03 momjian Exp $
33
PostgreSQL documentation
44
-->
55

@@ -358,9 +358,9 @@ COPY <replaceable class="parameter">count</replaceable>
358358
should not lead to problems in the event of a <command>COPY
359359
TO</command>, but the target table will already have received
360360
earlier rows in a <command>COPY FROM</command>. These rows will not
361-
be visible or accessible, but they still occupy disk space. Thismay
361+
be visible or accessible, but they still occupy disk space. Thismight
362362
amount to a considerable amount of wasted disk space if the failure
363-
happened well into a large copy operation. Youmay wish to invoke
363+
happened well into a large copy operation. Youmight wish to invoke
364364
<command>VACUUM</command> to recover the wasted space.
365365
</para>
366366
</refsect1>
@@ -395,7 +395,7 @@ COPY <replaceable class="parameter">count</replaceable>
395395
</para>
396396

397397
<para>
398-
Backslash characters (<literal>\</>)may be used in the
398+
Backslash characters (<literal>\</>)can be used in the
399399
<command>COPY</command> data to quote data characters that might
400400
otherwise be taken as row or column delimiters. In particular, the
401401
following characters <emphasis>must</> be preceded by a backslash if
@@ -694,7 +694,7 @@ There is no alignment padding or any other extra data between fields.
694694
<para>
695695
Presently, all data values in a <command>COPY BINARY</command> file are
696696
assumed to be in binary format (format code one). It is anticipated that a
697-
future extensionmay add a header field that allows per-column format codes
697+
future extensionmight add a header field that allows per-column format codes
698698
to be specified.
699699
</para>
700700

‎doc/src/sgml/ref/create_aggregate.sgml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!--
2-
$PostgreSQL: pgsql/doc/src/sgml/ref/create_aggregate.sgml,v 1.36 2006/09/16 00:30:17 momjian Exp $
2+
$PostgreSQL: pgsql/doc/src/sgml/ref/create_aggregate.sgml,v 1.37 2007/01/31 23:26:03 momjian Exp $
33
PostgreSQL documentation
44
-->
55

@@ -96,7 +96,7 @@ CREATE AGGREGATE <replaceable class="PARAMETER">name</replaceable> (
9696
</para>
9797

9898
<para>
99-
An aggregate functionmay provide an initial condition,
99+
An aggregate functioncan provide an initial condition,
100100
that is, an initial value for the internal state value.
101101
This is specified and stored in the database as a value of type
102102
<type>text</type>, but it must be a valid external representation

‎doc/src/sgml/ref/create_cast.sgml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<!-- $PostgreSQL: pgsql/doc/src/sgml/ref/create_cast.sgml,v 1.23 2006/09/16 00:30:17 momjian Exp $ -->
1+
<!-- $PostgreSQL: pgsql/doc/src/sgml/ref/create_cast.sgml,v 1.24 2007/01/31 23:26:03 momjian Exp $ -->
22

33
<refentry id="SQL-CREATECAST">
44
<refmeta>
@@ -44,7 +44,7 @@ SELECT CAST(42 AS text);
4444
</para>
4545

4646
<para>
47-
Two typesmay be <firstterm>binary compatible</firstterm>, which
47+
Two typescan be <firstterm>binary compatible</firstterm>, which
4848
means that they can be converted into one another <quote>for
4949
free</quote> without invoking any function. This requires that
5050
corresponding values use the same internal representation. For
@@ -145,7 +145,7 @@ SELECT 'The time is ' || CAST(now() AS text);
145145

146146
<listitem>
147147
<para>
148-
The function used to perform the cast. The function namemay
148+
The function used to perform the cast. The function namecan
149149
be schema-qualified. If it is not, the function will be looked
150150
up in the schema search path. The function's result data type must
151151
match the target type of the cast. Its arguments are discussed below.
@@ -169,7 +169,7 @@ SELECT 'The time is ' || CAST(now() AS text);
169169

170170
<listitem>
171171
<para>
172-
Indicates that the castmay be invoked implicitly in assignment
172+
Indicates that the castcan be invoked implicitly in assignment
173173
contexts.
174174
</para>
175175
</listitem>
@@ -180,14 +180,14 @@ SELECT 'The time is ' || CAST(now() AS text);
180180

181181
<listitem>
182182
<para>
183-
Indicates that the castmay be invoked implicitly in any context.
183+
Indicates that the castcan be invoked implicitly in any context.
184184
</para>
185185
</listitem>
186186
</varlistentry>
187187
</variablelist>
188188

189189
<para>
190-
Cast implementation functionsmay have one to three arguments.
190+
Cast implementation functionscan have one to three arguments.
191191
The first argument type must be identical to the cast's source type.
192192
The second argument,
193193
if present, must be type <type>integer</>; it receives the type

‎doc/src/sgml/ref/create_conversion.sgml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<!-- $PostgreSQL: pgsql/doc/src/sgml/ref/create_conversion.sgml,v 1.18 2006/09/16 00:30:17 momjian Exp $ -->
1+
<!-- $PostgreSQL: pgsql/doc/src/sgml/ref/create_conversion.sgml,v 1.19 2007/01/31 23:26:03 momjian Exp $ -->
22

33
<refentry id="SQL-CREATECONVERSION">
44
<refmeta>
@@ -27,7 +27,7 @@ CREATE [ DEFAULT ] CONVERSION <replaceable>name</replaceable>
2727

2828
<para>
2929
<command>CREATE CONVERSION</command> defines a new conversion between
30-
character set encodings. Conversion namesmay be used in the
30+
character set encodings. Conversion namescan be used in the
3131
<function>convert</function> function
3232
to specify a particular encoding conversion. Also, conversions that
3333
are marked <literal>DEFAULT</> can be used for automatic encoding
@@ -65,7 +65,7 @@ CREATE [ DEFAULT ] CONVERSION <replaceable>name</replaceable>
6565

6666
<listitem>
6767
<para>
68-
The name of the conversion. The conversion namemay be
68+
The name of the conversion. The conversion namecan be
6969
schema-qualified. If it is not, the conversion is defined in the
7070
current schema. The conversion name must be unique within a
7171
schema.
@@ -98,7 +98,7 @@ CREATE [ DEFAULT ] CONVERSION <replaceable>name</replaceable>
9898

9999
<listitem>
100100
<para>
101-
The function used to perform the conversion. The function namemay
101+
The function used to perform the conversion. The function namecan
102102
be schema-qualified. If it is not, the function will be looked
103103
up in the path.
104104
</para>
@@ -129,7 +129,7 @@ conv_proc(
129129
</para>
130130

131131
<para>
132-
The privileges required to create a conversionmay be changed in a future
132+
The privileges required to create a conversionmight be changed in a future
133133
release.
134134
</para>
135135
</refsect1>

0 commit comments

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