diff options
| author | redmatrix <redmatrix@redmatrix.me> | 2015-06-21 20:51:07 -0700 |
|---|---|---|
| committer | redmatrix <redmatrix@redmatrix.me> | 2015-06-21 20:51:07 -0700 |
| commit | ae6612025dcd31349056364d0c701bfda58470db (patch) | |
| tree | c67db564af1d2368344205fda2889f336dd14925 /doc | |
| parent | 33c9d8e06b2af512d25b0c9063ce58d86b72f747 (diff) | |
| parent | 0ad71b3efa7de4eb1f4313ffe4562ec83743bdc1 (diff) | |
| download | volse-hubzilla-ae6612025dcd31349056364d0c701bfda58470db.tar.gz volse-hubzilla-ae6612025dcd31349056364d0c701bfda58470db.tar.bz2 volse-hubzilla-ae6612025dcd31349056364d0c701bfda58470db.zip | |
Merge branch 'master' of https://github.com/redmatrix/redmatrix
Conflicts:
include/items.php
util/messages.po
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/Schema-development.md | 1 | ||||
| -rw-r--r-- | doc/schema_development.bb | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/doc/Schema-development.md b/doc/Schema-development.md index 3ac96a02b..e811bb8c3 100644 --- a/doc/Schema-development.md +++ b/doc/Schema-development.md @@ -30,6 +30,7 @@ If no personal options are set, and no schema is selected, we will first try to with the file name "default.php". This file should never be included with a theme. If it is, merge conflicts will occur as people update their code. Rather, this should be defined by administrators on a site by site basis. +default.php and default.css MUST be symlinks to existing scheme files. You schema does not need to - and should not - contain all of these values. Only the values that differ from the defaults should be listed. This gives you some very powerful options diff --git a/doc/schema_development.bb b/doc/schema_development.bb index 998111431..3d4c84e85 100644 --- a/doc/schema_development.bb +++ b/doc/schema_development.bb @@ -28,6 +28,7 @@ If no personal options are set, and no schema is selected, we will first try to with the file name "default.php". This file should never be included with a theme. If it
is, merge conflicts will occur as people update their code. Rather, this should be defined
by administrators on a site by site basis.
+default.php and default.css MUST be symlinks to existing scheme files.
You schema does not need to - and should not - contain all of these values. Only the values
that differ from the defaults should be listed. This gives you some very powerful options
|