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

Commitf5f1355

Browse files
committed
Wording improvements
1 parenta82cfcb commitf5f1355

File tree

6 files changed

+14
-14
lines changed

6 files changed

+14
-14
lines changed

‎src/backend/tsearch/ts_utils.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $PostgreSQL: pgsql/src/backend/tsearch/ts_utils.c,v 1.7 2007/11/15 22:25:16 momjian Exp $
10+
* $PostgreSQL: pgsql/src/backend/tsearch/ts_utils.c,v 1.8 2007/12/27 13:02:48 petere Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -69,7 +69,7 @@ comparestr(const void *a, const void *b)
6969
}
7070

7171
/*
72-
* Reads astopword file. Each word is run through 'wordop'
72+
* Reads astop-word file. Each word is run through 'wordop'
7373
* function, if given.wordop may either modify the input in-place,
7474
* or palloc a new version.
7575
*/
@@ -89,7 +89,7 @@ readstoplist(const char *fname, StopList *s, char *(*wordop) (const char *))
8989
if ((hin=AllocateFile(filename,"r"))==NULL)
9090
ereport(ERROR,
9191
(errcode(ERRCODE_CONFIG_FILE_ERROR),
92-
errmsg("could not openstopword file \"%s\": %m",
92+
errmsg("could not openstop-word file \"%s\": %m",
9393
filename)));
9494

9595
while ((line=t_readline(hin))!=NULL)

‎src/backend/utils/adt/tsquery.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $PostgreSQL: pgsql/src/backend/utils/adt/tsquery.c,v 1.12 2007/11/28 21:56:30 tgl Exp $
10+
* $PostgreSQL: pgsql/src/backend/utils/adt/tsquery.c,v 1.13 2007/12/27 13:02:48 petere Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -498,7 +498,7 @@ parse_tsquery(char *buf,
498498
if (list_length(state.polstr)==0)
499499
{
500500
ereport(NOTICE,
501-
(errmsg("tsearch query doesn't containlexeme(s): \"%s\"",
501+
(errmsg("text-search query doesn't containlexemes: \"%s\"",
502502
state.buffer)));
503503
query= (TSQuery)palloc(HDRSIZETQ);
504504
SET_VARSIZE(query,HDRSIZETQ);

‎src/backend/utils/adt/tsquery_cleanup.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $PostgreSQL: pgsql/src/backend/utils/adt/tsquery_cleanup.c,v 1.8 2007/11/28 21:56:30 tgl Exp $
11+
* $PostgreSQL: pgsql/src/backend/utils/adt/tsquery_cleanup.c,v 1.9 2007/12/27 13:02:48 petere Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
@@ -282,7 +282,7 @@ clean_fakeval(QueryItem *ptr, int *len)
282282
if (result!=V_UNKNOWN)
283283
{
284284
ereport(NOTICE,
285-
(errmsg("query contains onlystopword(s)or doesn't containlexeme(s), ignored")));
285+
(errmsg("text-searchquery contains onlystop wordsor doesn't containlexemes, ignored")));
286286
*len=0;
287287
returnNULL;
288288
}

‎src/backend/utils/adt/tsvector_op.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $PostgreSQL: pgsql/src/backend/utils/adt/tsvector_op.c,v 1.10 2007/11/28 21:56:30 tgl Exp $
10+
* $PostgreSQL: pgsql/src/backend/utils/adt/tsvector_op.c,v 1.11 2007/12/27 13:02:48 petere Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -1324,7 +1324,7 @@ tsvector_update_trigger(PG_FUNCTION_ARGS, bool config_column)
13241324
if (config_attr_num==SPI_ERROR_NOATTRIBUTE)
13251325
ereport(ERROR,
13261326
(errcode(ERRCODE_UNDEFINED_COLUMN),
1327-
errmsg("config column \"%s\" does not exist",
1327+
errmsg("configuration column \"%s\" does not exist",
13281328
trigger->tgargs[1])));
13291329
if (SPI_gettypeid(rel->rd_att,config_attr_num)!=REGCONFIGOID)
13301330
ereport(ERROR,
@@ -1336,7 +1336,7 @@ tsvector_update_trigger(PG_FUNCTION_ARGS, bool config_column)
13361336
if (isnull)
13371337
ereport(ERROR,
13381338
(errcode(ERRCODE_NULL_VALUE_NOT_ALLOWED),
1339-
errmsg("config column \"%s\" must not beNULL",
1339+
errmsg("configuration column \"%s\" must not benull",
13401340
trigger->tgargs[1])));
13411341
cfgId=DatumGetObjectId(datum);
13421342
}

‎src/backend/utils/misc/guc.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
* Written by Peter Eisentraut <peter_e@gmx.net>.
1111
*
1212
* IDENTIFICATION
13-
* $PostgreSQL: pgsql/src/backend/utils/misc/guc.c,v 1.426 2007/11/15 21:14:41 momjian Exp $
13+
* $PostgreSQL: pgsql/src/backend/utils/misc/guc.c,v 1.427 2007/12/27 13:02:48 petere Exp $
1414
*
1515
*--------------------------------------------------------------------
1616
*/
@@ -2024,7 +2024,7 @@ static struct config_string ConfigureNamesString[] =
20242024
{"session_replication_role",PGC_SUSET,CLIENT_CONN_STATEMENT,
20252025
gettext_noop("Sets the sessions behavior for triggers and rewrite rules."),
20262026
gettext_noop("Each session can be either"
2027-
" \"origin\", \"replica\" or \"local\".")
2027+
" \"origin\", \"replica\", or \"local\".")
20282028
},
20292029
&session_replication_role_string,
20302030
"origin",assign_session_replication_role,NULL

‎src/port/open.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
*
77
* Portions Copyright (c) 1996-2007, PostgreSQL Global Development Group
88
*
9-
* $PostgreSQL: pgsql/src/port/open.c,v 1.23 2007/12/20 20:27:53 mha Exp $
9+
* $PostgreSQL: pgsql/src/port/open.c,v 1.24 2007/12/27 13:02:48 petere Exp $
1010
*
1111
*-------------------------------------------------------------------------
1212
*/
@@ -111,7 +111,7 @@ pgwin32_open(const char *fileName, int fileFlags,...)
111111
(errmsg("could not open file \"%s\": %s",fileName,
112112
(err==ERROR_SHARING_VIOLATION)?_("sharing violation"):_("lock violation")),
113113
errdetail("Continuing to retry for 30 seconds."),
114-
errhint("You may have antivirus, backup or similar software interfering with the database.")));
114+
errhint("You may have antivirus, backup, or similar software interfering with the database system.")));
115115
#endif
116116

117117
if (loops<300)

0 commit comments

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