Mattflaschen has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/71850


Change subject: Add more detail to settings documentation.
......................................................................

Add more detail to settings documentation.

Change-Id: I04e8b75977fcfa5476d8c59848ed5ebeca6d4c36
---
M README
M settings.d/README
2 files changed, 11 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant 
refs/changes/50/71850/1

diff --git a/README b/README
index f190937..0033ca7 100644
--- a/README
+++ b/README
@@ -65,6 +65,9 @@
 with the vagrant files run `git pull` and then `vagrant reload`.  The latter
 will restart the VM.
 
+## Settings
+
+For information about settings, see settings.d/README.
 
 ## Troubleshoot
 
diff --git a/settings.d/README b/settings.d/README
index dc02296..4b626ea 100644
--- a/settings.d/README
+++ b/settings.d/README
@@ -18,9 +18,14 @@
        |   /|  \        This directory is accessible as
        | _/ T  /        '/vagrant/settings.d' in the guest environment.
        |  | |  |
-       |  | |__|_       Because the files load alphabeticallly, you can use a
-       |__| '-.__)      two-digit prefix to tweak the load order -- e.g.:
-  jgs  \__)
+       |  | |__|_       There are two separate groups of settings, 
Puppet-managed
+       |__| '-.__)      settings and custom settings.  All Puppet-managed 
settings
+  jgs  \__)             are loaded after the custom settings have finished 
loading.
+
+                        Within each settings group, the settings are loaded
+                        alphabetically.  Thus, you can use a two-digit prefix 
to
+                        tweak the load order. E.g.:
+
                             settings/
                             ├── 10-RunFirst.php
                             ├── 20-SomeExtension.php

-- 
To view, visit https://gerrit.wikimedia.org/r/71850
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I04e8b75977fcfa5476d8c59848ed5ebeca6d4c36
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: Mattflaschen <[email protected]>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to