Skip to content

Commit ded916a

Browse files
committed
fix docs now pointing to YAML configs
1 parent c4b70e4 commit ded916a

8 files changed

+47
-47
lines changed

docs/locale/zh/LC_MESSAGES/administration.po

+6-6
Original file line numberDiff line numberDiff line change
@@ -143,12 +143,12 @@ msgstr "加载记录"
143143
#: ../../administration.rst:79
144144
msgid ""
145145
"This will import all ``*.xml`` records from ``/path/to/records`` into the "
146-
"database specified in ``default.cfg`` (``repository.database``). Passing ``-"
146+
"database specified in ``default.yml`` (``repository.database``). Passing ``-"
147147
"r`` to the script will process ``/path/to/records`` recursively. Passing ``-"
148148
"y`` to the script will force overwrite existing metadata with the same "
149149
"identifier. Note that ``-p`` accepts either a directory path or single file."
150150
msgstr ""
151-
"这时所有的 ``*.xml`` 记录就会从 ``/path/to/records`` 导入到 ``default.cfg`` 中指"
151+
"这时所有的 ``*.xml`` 记录就会从 ``/path/to/records`` 导入到 ``default.yml`` 中指"
152152
"定的数据库 (``repository.database``)。将 ``-r`` 传递到脚本中, 程序 ``/path/to/"
153153
"records`` 就会递归运行。将 ``-y`` 传递到脚本中, 程序 ``/path/to/records`` 将强"
154154
"制替换现有的相同元数据标识符。请注意, ``-p`` 只能接受一个目录路径或单个文件。"
@@ -163,11 +163,11 @@ msgstr "导出数据库"
163163

164164
#: ../../administration.rst:91
165165
msgid ""
166-
"This will write each record in the database specified in ``default.cfg`` "
166+
"This will write each record in the database specified in ``default.yml`` "
167167
"(``repository.database``) to an XML document on disk, in directory ``/path/to/"
168168
"output_dir``."
169169
msgstr ""
170-
"这会将 ``default.cfg`` (``repository.database``) 中指定的数据库的每条记录写入磁"
170+
"这会将 ``default.yml`` (``repository.database``) 中指定的数据库的每条记录写入磁"
171171
"盘上的 ``/path/to/output_dir`` 目录中的 XML 文档。"
172172

173173
#: ../../administration.rst:94
@@ -288,10 +288,10 @@ msgstr "定于基于 ``etc/mappings.py`` 数据库映射"
288288

289289
#: ../../administration.rst:142
290290
msgid ""
291-
"in ``default.cfg``, set ``repository.mappings`` to the location of the mappings."
291+
"in ``default.yml``, set ``repository.mappings`` to the location of the mappings."
292292
"py file:"
293293
msgstr ""
294-
"在 ``default.cfg`` 中,设置 ``repository.mappings`` 为 mappings.py 文件的位置:"
294+
"在 ``default.yml`` 中,设置 ``repository.mappings`` 为 mappings.py 文件的位置:"
295295

296296
#: ../../administration.rst:150
297297
msgid "Note you can also reference mappings as a Python object as a dotted path:"

docs/locale/zh/LC_MESSAGES/configuration.po

+13-13
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,12 @@ msgstr "配置"
2121

2222
#: ../../configuration.rst:6
2323
msgid ""
24-
"pycsw's runtime configuration is defined by ``default.cfg``. pycsw ships with "
25-
"a `sample configuration`_ (``default-sample.cfg``). Copy the file to ``default."
26-
"cfg`` and edit the following:"
24+
"pycsw's runtime configuration is defined by ``default.yml``. pycsw ships with "
25+
"a `sample configuration`_ (``default-sample.yml``). Copy the file to ``default."
26+
.yml`` and edit the following:"
2727
msgstr ""
28-
"pycsw 的运行配置写为此格式 ``default.cfg`` 。 pycsw 还有一个示例配置 "
29-
"( ``default-sample.cfg`` )。 将文件复制到 ``default.cfg`` 并编辑以下内容:"
28+
"pycsw 的运行配置写为此格式 ``default.yml`` 。 pycsw 还有一个示例配置 "
29+
"( ``default-sample.yml`` )。 将文件复制到 ``default.yml`` 并编辑以下内容:"
3030

3131
#: ../../configuration.rst:8
3232
msgid "**[server]**"
@@ -446,21 +446,21 @@ msgstr "备用配置"
446446

447447
#: ../../configuration.rst:109
448448
msgid ""
449-
"By default, pycsw loads ``default.cfg`` at runtime. To load an alternate "
449+
"By default, pycsw loads ``default.yml`` at runtime. To load an alternate "
450450
"configuration, modify ``csw.py`` to point to the desired configuration. "
451451
"Alternatively, pycsw supports explicitly specifiying a configuration by "
452-
"appending ``config=/path/to/default.cfg`` to the base URL of the service (e.g. "
452+
"appending ``config=/path/to/default.yml`` to the base URL of the service (e.g. "
453453
"``http://localhost/pycsw/csw.py?config=tests/suites/default/default."
454-
"cfg&service=CSW&version=2.0.2&request=GetCapabilities``). When the ``config`` "
454+
.yml&service=CSW&version=2.0.2&request=GetCapabilities``). When the ``config`` "
455455
"parameter is passed by a CSW client, pycsw will override the default "
456456
"configuration location and subsequent settings with those of the specified "
457457
"configuration."
458458
msgstr ""
459-
"默认情况下,pycsw在运行时加载的是 ``default.cfg`` 。要加载备用配置,请修改 "
459+
"默认情况下,pycsw在运行时加载的是 ``default.yml`` 。要加载备用配置,请修改 "
460460
"``csw.py`` 以指向所需的配置。另外,pycsw还可以通过附加 ``config=/path/to/"
461-
"default.cfg`` 到服务器的基础URL来显式定义配置,例如 ``http://localhost/pycsw/"
461+
"default.yml`` 到服务器的基础URL来显式定义配置,例如 ``http://localhost/pycsw/"
462462
"csw.py?config=tests/suites/default/default."
463-
"cfg&service=CSW&version=2.0.2&request=GetCapabilities`` 。当 ``config`` 参数通过"
463+
.yml&service=CSW&version=2.0.2&request=GetCapabilities`` 。当 ``config`` 参数通过"
464464
"CSW客户端时,pycsw就会覆盖默认的配置所在地址,并且用这些指定的配置来完成接下来的"
465465
"一系列设置。"
466466

@@ -502,11 +502,11 @@ msgstr "配置文件位置"
502502
#: ../../configuration.rst:129
503503
msgid ""
504504
"One option is using Apache's ``Alias`` and ``SetEnvIf`` directives. For "
505-
"example, given the base URL ``http://localhost/pycsw/csw.py?config=foo.cfg``, "
505+
"example, given the base URL ``http://localhost/pycsw/csw.py?config=foo.yml``, "
506506
"set the following in your Apache configuration:"
507507
msgstr ""
508508
"有一种选择是使用 Apache 的 ``Alias`` 和 ``SetEnvIf`` 指令。 例如,可以指定基 "
509-
"URL ``http://localhost/pycsw/csw.py?config=foo.cfg`` ,在 Apache 的 ``httpd."
509+
"URL ``http://localhost/pycsw/csw.py?config=foo.yml`` ,在 Apache 的 ``httpd."
510510
"conf`` 下配置以下指令:"
511511

512512
#: ../../configuration.rst:138

docs/locale/zh/LC_MESSAGES/distributedsearching.po

+10-10
Original file line numberDiff line numberDiff line change
@@ -67,23 +67,23 @@ msgstr ""
6767
"模式公开额外的 CSW 端点:"
6868

6969
#: ../../distributedsearching.rst:24
70-
msgid "CSW-1: ``http://localhost/pycsw/csw.py?config=CSW-1.cfg``"
71-
msgstr "CSW-1: ``http://localhost/pycsw/csw.py?config=CSW-1.cfg``"
70+
msgid "CSW-1: ``http://localhost/pycsw/csw.py?config=CSW-1.yml``"
71+
msgstr "CSW-1: ``http://localhost/pycsw/csw.py?config=CSW-1.yml``"
7272

7373
#: ../../distributedsearching.rst:26
74-
msgid "CSW-2: ``http://localhost/pycsw/csw.py?config=CSW-2.cfg``"
75-
msgstr "CSW-2: ``http://localhost/pycsw/csw.py?config=CSW-2.cfg``"
74+
msgid "CSW-2: ``http://localhost/pycsw/csw.py?config=CSW-2.yml``"
75+
msgstr "CSW-2: ``http://localhost/pycsw/csw.py?config=CSW-2.yml``"
7676

7777
#: ../../distributedsearching.rst:28
78-
msgid "CSW-3: ``http://localhost/pycsw/csw.py?config=CSW-3.cfg``"
79-
msgstr "CSW-3: ``http://localhost/pycsw/csw.py?config=CSW-3.cfg``"
78+
msgid "CSW-3: ``http://localhost/pycsw/csw.py?config=CSW-3.yml``"
79+
msgstr "CSW-3: ``http://localhost/pycsw/csw.py?config=CSW-3.yml``"
8080

8181
#: ../../distributedsearching.rst:30
8282
msgid ""
83-
"...where the ``*.cfg`` configuration files are configured for each respective metadata repository. "
83+
"...where the ``*.yml`` configuration files are configured for each respective metadata repository. "
8484
"The above CSW endpoints can be interacted with as usual."
8585
msgstr ""
86-
"只要有 ``*.cfg`` 配置文件,就可以为每个元数据存储库进行配置。以上的CSW端点也可以像往常一样进行交互。"
86+
"只要有 ``*.yml`` 配置文件,就可以为每个元数据存储库进行配置。以上的CSW端点也可以像往常一样进行交互。"
8787

8888
#: ../../distributedsearching.rst:32
8989
msgid ""
@@ -95,8 +95,8 @@ msgstr ""
9595
"能:"
9696

9797
#: ../../distributedsearching.rst:34
98-
msgid "CSW-all: ``http://localhost/pycsw/csw.py?config=CSW-all.cfg``"
99-
msgstr "所有的CSW: ``http://localhost/pycsw/csw.py?config=CSW-all.cfg``"
98+
msgid "CSW-all: ``http://localhost/pycsw/csw.py?config=CSW-all.yml``"
99+
msgstr "所有的CSW: ``http://localhost/pycsw/csw.py?config=CSW-all.yml``"
100100

101101
#: ../../distributedsearching.rst:36
102102
msgid ""

docs/locale/zh/LC_MESSAGES/docker.po

+4-4
Original file line numberDiff line numberDiff line change
@@ -112,11 +112,11 @@ msgid ""
112112
"It is possible to supply a custom configuration file for pycsw as a bind mount or as "
113113
"a docker secret (in the case of docker swarm). The configuration file is searched at "
114114
"the value of the ``PYCSW_CONFIG`` environmental variable, which defaults to ``/etc/"
115-
"pycsw/pycsw.cfg``."
115+
"pycsw/pycsw.yml``."
116116
msgstr ""
117117
"可以为pycsw提供自定义配置文件作为绑定安装或作为docker秘密(在docker群集的情况下)。配"
118118
"置文件在 ``PYCSW_CONFIG`` 环境变量的值处进行搜索,该环境变量默认为 ``/etc/pycsw/"
119-
"pycsw.cfg`` 。"
119+
"pycsw.yml`` 。"
120120

121121
#: ../../docker.rst:74
122122
msgid "Supplying the configuration file via bind mount::"
@@ -146,8 +146,8 @@ msgstr "PostgreSQL存储库"
146146
#: ../../docker.rst:114
147147
msgid ""
148148
"Specifying a PostgreSQL repository is just a matter of configuring a custom pycsw."
149-
"cfg file with the correct specification."
150-
msgstr "指定PostgreSQL存储库只是用正确的规范配置自定义pycsw.cfg 文件的问题。"
149+
.yml file with the correct specification."
150+
msgstr "指定PostgreSQL存储库只是用正确的规范配置自定义pycsw.yml 文件的问题。"
151151

152152
#: ../../docker.rst:117
153153
msgid ""

docs/locale/zh/LC_MESSAGES/installation.po

+4-4
Original file line numberDiff line numberDiff line change
@@ -267,19 +267,19 @@ msgstr "安全性"
267267

268268
#: ../../installation.rst:199
269269
msgid ""
270-
"By default, ``default.cfg`` is at the root of the pycsw install. If pycsw is "
270+
"By default, ``default.yml`` is at the root of the pycsw install. If pycsw is "
271271
"setup outside an HTTP server's ``cgi-bin`` area, this file could be read. The "
272272
"following options protect the configuration:"
273273
msgstr ""
274-
"默认情况下, ``default.cfg`` 是 pycsw 安装的根目录。 如果 pycsw 设置在 HTTP 服务"
274+
"默认情况下, ``default.yml`` 是 pycsw 安装的根目录。 如果 pycsw 设置在 HTTP 服务"
275275
"器 ``cgi-bin`` 区域以外,此文件就可以被读取。 以下是几项保护配置的选项:"
276276

277277
#: ../../installation.rst:201
278278
msgid ""
279-
"move ``default.cfg`` to a non HTTP accessible area, and modify ``csw.py`` to "
279+
"move ``default.yml`` to a non HTTP accessible area, and modify ``csw.py`` to "
280280
"point to the updated location"
281281
msgstr ""
282-
"将 ``default.cfg`` 移动到非 HTTP 可访问的区域,并修改 ``csw.py`` 以指向更新的位置"
282+
"将 ``default.yml`` 移动到非 HTTP 可访问的区域,并修改 ``csw.py`` 以指向更新的位置"
283283

284284
#: ../../installation.rst:202
285285
msgid ""

docs/locale/zh/LC_MESSAGES/testing.po

+8-8
Original file line numberDiff line numberDiff line change
@@ -119,9 +119,9 @@ msgstr ""
119119

120120
#: ../../testing.rst:66
121121
msgid ""
122-
"A mandatory ``default.cfg`` file with the pycsw configuration that must be used "
122+
"A mandatory ``default.yml`` file with the pycsw configuration that must be used "
123123
"by the test suite;"
124-
msgstr "测试套件必须使用的带有 pycsw 配置的强制 ``default.cfg`` 文件;"
124+
msgstr "测试套件必须使用的带有 pycsw 配置的强制 ``default.yml`` 文件;"
125125

126126
#: ../../testing.rst:69
127127
msgid ""
@@ -263,8 +263,8 @@ msgid ""
263263
msgstr "在 ``tests/functionaltests/suites`` (如 ``foo`` )下创建一个新目录"
264264

265265
#: ../../testing.rst:141
266-
msgid "Create a new configuration in ``tests/suites/foo/default.cfg``"
267-
msgstr "在 ``tests/suites/foo/default.cfg`` 创建一个新的配置"
266+
msgid "Create a new configuration in ``tests/suites/foo/default.yml``"
267+
msgstr "在 ``tests/suites/foo/default.yml`` 创建一个新的配置"
268268

269269
#: ../../testing.rst:142
270270
msgid "Populate HTTP POST requests in ``tests/suites/foo/post``"
@@ -584,8 +584,8 @@ msgstr "导航到 ``http://host/path/to/pycsw/tests/index.html`` 。"
584584
#~ "测试框架将针对一系列“套件”(在``测试/ suites``)完成运行,其中每一项均指定一个"
585585
#~ "给定的配置,以测试基本代码的各种功能。每个套件的结构如下:"
586586

587-
#~ msgid "``tests/suites/suite/default.cfg``: the configuration for the suite"
588-
#~ msgstr "`tests/suites/suite/default.cfg`:对于该套件的配置"
587+
#~ msgid "``tests/suites/suite/default.yml``: the configuration for the suite"
588+
#~ msgstr "`tests/suites/suite/default.yml`:对于该套件的配置"
589589

590590
#~ msgid ""
591591
#~ "``tests/suites/suite/post``: directory of XML documents for HTTP POST requests"
@@ -608,8 +608,8 @@ msgstr "导航到 ``http://host/path/to/pycsw/tests/index.html`` 。"
608608
#~ msgid "When the tests are invoked, the following operations are run:"
609609
#~ msgstr "当测试被调用,将执行以下操作:"
610610

611-
#~ msgid "pycsw configuration is set to ``tests/suites/suite/default.cfg``"
612-
#~ msgstr "pycsw配置设置为`tests/suites/suite/default.cfg`"
611+
#~ msgid "pycsw configuration is set to ``tests/suites/suite/default.yml``"
612+
#~ msgstr "pycsw配置设置为`tests/suites/suite/default.yml`"
613613

614614
#~ msgid "HTTP POST requests are run against ``tests/suites/suite/post/*.xml``"
615615
#~ msgstr "HTTP POST请求是针对 `tests/suites/suite/post/*.xml` 运行的"

docs/testing.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ Suites for xml-based standards (CSW, ATOM, etc)
5555
A number of different test suites exist under ``tests/functionaltests/suites``.
5656
Each suite specifies the following structure:
5757

58-
* A mandatory ``default.cfg`` file with the pycsw configuration that must be
58+
* A mandatory ``default.yml`` file with the pycsw configuration that must be
5959
used by the test suite;
6060

6161
* A mandatory ``expected/`` directory containing the expected results for each

etc/harvest-all.cron

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@
22
#
33
# info on setting up cron at http://www.unixgeeks.org/security/newbie/unix/cron-1.html
44

5-
00 04 * * * /path/to/pycsw-admin.py refresh-harvested-records --config /path/to/default.cfg
5+
00 04 * * * /path/to/pycsw-admin.py refresh-harvested-records --config /path/to/default.yml

0 commit comments

Comments
 (0)