projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '20457-logs-and-mem-usage'
[arvados.git]
/
doc
/
admin
/
config.html.textile.liquid
diff --git
a/doc/admin/config.html.textile.liquid
b/doc/admin/config.html.textile.liquid
index 316b6f48b7f567d8e92aefe3a9926ff1110b680c..a043d6d1c09be1326f7a65b5e8f131db40b08ae9 100644
(file)
--- a/
doc/admin/config.html.textile.liquid
+++ b/
doc/admin/config.html.textile.liquid
@@
-10,9
+10,7
@@
Copyright (C) The Arvados Authors. All rights reserved.
SPDX-License-Identifier: CC-BY-SA-3.0
{% endcomment %}
SPDX-License-Identifier: CC-BY-SA-3.0
{% endcomment %}
-The master Arvados configuration is stored at @/etc/arvados/config.yml@
-
-See "Migrating Configuration":config-migration.html for information about migrating from legacy component-specific configuration files.
+The Arvados configuration is stored at @/etc/arvados/config.yml@
{% codeblock as yaml %}
{% include 'config_default_yml' %}
{% codeblock as yaml %}
{% include 'config_default_yml' %}