Fossil SCM
mention required location of ".fossil-settings/*" files in docs and comment, and fix typo
Commit
c510b74dd8ecd076c583a382200d4b6d64c547df
Parent
eb423a74b579280…
3 files changed
+4
-3
+2
-1
+3
-2
M
src/db.c
+4
-3
| --- src/db.c | ||
| +++ src/db.c | ||
| @@ -1974,12 +1974,13 @@ | ||
| 1974 | 1974 | ** the user about the conflict */ |
| 1975 | 1975 | fossil_warning( |
| 1976 | 1976 | "setting %s has both versioned and non-versioned values: using " |
| 1977 | 1977 | "versioned value from file .fossil-settings/%s (to silence this " |
| 1978 | 1978 | "warning, either create an empty file named " |
| 1979 | - ".fossil-settings/%s.no-warn or delete the non-versioned setting " | |
| 1980 | - " with \"fossil unset %s\")", zName, zName, zName, zName | |
| 1979 | + ".fossil-settings/%s.no-warn in the check-out root, " | |
| 1980 | + "or delete the non-versioned setting " | |
| 1981 | + "with \"fossil unset %s\")", zName, zName, zName, zName | |
| 1981 | 1982 | ); |
| 1982 | 1983 | } |
| 1983 | 1984 | /* Prefer the versioned setting */ |
| 1984 | 1985 | return ( zVersionedSetting!=0 ) ? zVersionedSetting : zNonVersionedSetting; |
| 1985 | 1986 | } |
| @@ -2462,11 +2463,11 @@ | ||
| 2462 | 2463 | ** The "settings" command with no arguments lists all properties and their |
| 2463 | 2464 | ** values. With just a property name it shows the value of that property. |
| 2464 | 2465 | ** With a value argument it changes the property for the current repository. |
| 2465 | 2466 | ** |
| 2466 | 2467 | ** Settings marked as versionable are overridden by the contents of the |
| 2467 | -** file named .fossil-settings/PROPERTY in the checked out files, if that | |
| 2468 | +** file named .fossil-settings/PROPERTY in the check-out root, if that | |
| 2468 | 2469 | ** file exists. |
| 2469 | 2470 | ** |
| 2470 | 2471 | ** The "unset" command clears a property setting. |
| 2471 | 2472 | ** |
| 2472 | 2473 | ** |
| 2473 | 2474 |
| --- src/db.c | |
| +++ src/db.c | |
| @@ -1974,12 +1974,13 @@ | |
| 1974 | ** the user about the conflict */ |
| 1975 | fossil_warning( |
| 1976 | "setting %s has both versioned and non-versioned values: using " |
| 1977 | "versioned value from file .fossil-settings/%s (to silence this " |
| 1978 | "warning, either create an empty file named " |
| 1979 | ".fossil-settings/%s.no-warn or delete the non-versioned setting " |
| 1980 | " with \"fossil unset %s\")", zName, zName, zName, zName |
| 1981 | ); |
| 1982 | } |
| 1983 | /* Prefer the versioned setting */ |
| 1984 | return ( zVersionedSetting!=0 ) ? zVersionedSetting : zNonVersionedSetting; |
| 1985 | } |
| @@ -2462,11 +2463,11 @@ | |
| 2462 | ** The "settings" command with no arguments lists all properties and their |
| 2463 | ** values. With just a property name it shows the value of that property. |
| 2464 | ** With a value argument it changes the property for the current repository. |
| 2465 | ** |
| 2466 | ** Settings marked as versionable are overridden by the contents of the |
| 2467 | ** file named .fossil-settings/PROPERTY in the checked out files, if that |
| 2468 | ** file exists. |
| 2469 | ** |
| 2470 | ** The "unset" command clears a property setting. |
| 2471 | ** |
| 2472 | ** |
| 2473 |
| --- src/db.c | |
| +++ src/db.c | |
| @@ -1974,12 +1974,13 @@ | |
| 1974 | ** the user about the conflict */ |
| 1975 | fossil_warning( |
| 1976 | "setting %s has both versioned and non-versioned values: using " |
| 1977 | "versioned value from file .fossil-settings/%s (to silence this " |
| 1978 | "warning, either create an empty file named " |
| 1979 | ".fossil-settings/%s.no-warn in the check-out root, " |
| 1980 | "or delete the non-versioned setting " |
| 1981 | "with \"fossil unset %s\")", zName, zName, zName, zName |
| 1982 | ); |
| 1983 | } |
| 1984 | /* Prefer the versioned setting */ |
| 1985 | return ( zVersionedSetting!=0 ) ? zVersionedSetting : zNonVersionedSetting; |
| 1986 | } |
| @@ -2462,11 +2463,11 @@ | |
| 2463 | ** The "settings" command with no arguments lists all properties and their |
| 2464 | ** values. With just a property name it shows the value of that property. |
| 2465 | ** With a value argument it changes the property for the current repository. |
| 2466 | ** |
| 2467 | ** Settings marked as versionable are overridden by the contents of the |
| 2468 | ** file named .fossil-settings/PROPERTY in the check-out root, if that |
| 2469 | ** file exists. |
| 2470 | ** |
| 2471 | ** The "unset" command clears a property setting. |
| 2472 | ** |
| 2473 | ** |
| 2474 |
+2
-1
| --- src/setup.c | ||
| +++ src/setup.c | ||
| @@ -1472,11 +1472,12 @@ | ||
| 1472 | 1472 | } |
| 1473 | 1473 | } |
| 1474 | 1474 | @ </td></tr></table> |
| 1475 | 1475 | @ </div></form> |
| 1476 | 1476 | @ <p>Settings marked with (v) are 'versionable' and will be overridden |
| 1477 | - @ by the contents of files named <tt>.fossil-settings/PROPERTY</tt>. | |
| 1477 | + @ by the contents of files named <tt>.fossil-settings/PROPERTY</tt> | |
| 1478 | + @ in the check-out root. | |
| 1478 | 1479 | @ If such a file is present, the corresponding field above is not |
| 1479 | 1480 | @ editable.</p><hr /><p> |
| 1480 | 1481 | @ These settings work in the same way, as the <kbd>set</kbd> |
| 1481 | 1482 | @ commandline:<br /> |
| 1482 | 1483 | @ </p><pre>%s(zHelp_setting_cmd)</pre> |
| 1483 | 1484 |
| --- src/setup.c | |
| +++ src/setup.c | |
| @@ -1472,11 +1472,12 @@ | |
| 1472 | } |
| 1473 | } |
| 1474 | @ </td></tr></table> |
| 1475 | @ </div></form> |
| 1476 | @ <p>Settings marked with (v) are 'versionable' and will be overridden |
| 1477 | @ by the contents of files named <tt>.fossil-settings/PROPERTY</tt>. |
| 1478 | @ If such a file is present, the corresponding field above is not |
| 1479 | @ editable.</p><hr /><p> |
| 1480 | @ These settings work in the same way, as the <kbd>set</kbd> |
| 1481 | @ commandline:<br /> |
| 1482 | @ </p><pre>%s(zHelp_setting_cmd)</pre> |
| 1483 |
| --- src/setup.c | |
| +++ src/setup.c | |
| @@ -1472,11 +1472,12 @@ | |
| 1472 | } |
| 1473 | } |
| 1474 | @ </td></tr></table> |
| 1475 | @ </div></form> |
| 1476 | @ <p>Settings marked with (v) are 'versionable' and will be overridden |
| 1477 | @ by the contents of files named <tt>.fossil-settings/PROPERTY</tt> |
| 1478 | @ in the check-out root. |
| 1479 | @ If such a file is present, the corresponding field above is not |
| 1480 | @ editable.</p><hr /><p> |
| 1481 | @ These settings work in the same way, as the <kbd>set</kbd> |
| 1482 | @ commandline:<br /> |
| 1483 | @ </p><pre>%s(zHelp_setting_cmd)</pre> |
| 1484 |
+3
-2
| --- www/settings.wiki | ||
| +++ www/settings.wiki | ||
| @@ -42,12 +42,13 @@ | ||
| 42 | 42 | with the <tt>extras</tt> command. |
| 43 | 43 | |
| 44 | 44 | Because these options can change over time, and the inconvenience of |
| 45 | 45 | replicating changes, these settings are "versionable". As well as being |
| 46 | 46 | able to be set using the <tt>settings</tt> command or the web interface, |
| 47 | -you can created versioned files in the <tt>.fossil-settings</tt> | |
| 48 | -directory named with the setting name. The contents of the file is the | |
| 47 | +you can create versioned files in the <tt>.fossil-settings</tt> | |
| 48 | +subdirectory of the check-out root, named with the setting name. | |
| 49 | +The contents of the file is the | |
| 49 | 50 | value of the setting, and these files are checked in, committed, merged, |
| 50 | 51 | and so on, as with any other file. |
| 51 | 52 | |
| 52 | 53 | Where a setting is a list of values, such as <tt>ignore-glob</tt>, you |
| 53 | 54 | can use a newline as a separator as well as a comma. |
| 54 | 55 |
| --- www/settings.wiki | |
| +++ www/settings.wiki | |
| @@ -42,12 +42,13 @@ | |
| 42 | with the <tt>extras</tt> command. |
| 43 | |
| 44 | Because these options can change over time, and the inconvenience of |
| 45 | replicating changes, these settings are "versionable". As well as being |
| 46 | able to be set using the <tt>settings</tt> command or the web interface, |
| 47 | you can created versioned files in the <tt>.fossil-settings</tt> |
| 48 | directory named with the setting name. The contents of the file is the |
| 49 | value of the setting, and these files are checked in, committed, merged, |
| 50 | and so on, as with any other file. |
| 51 | |
| 52 | Where a setting is a list of values, such as <tt>ignore-glob</tt>, you |
| 53 | can use a newline as a separator as well as a comma. |
| 54 |
| --- www/settings.wiki | |
| +++ www/settings.wiki | |
| @@ -42,12 +42,13 @@ | |
| 42 | with the <tt>extras</tt> command. |
| 43 | |
| 44 | Because these options can change over time, and the inconvenience of |
| 45 | replicating changes, these settings are "versionable". As well as being |
| 46 | able to be set using the <tt>settings</tt> command or the web interface, |
| 47 | you can create versioned files in the <tt>.fossil-settings</tt> |
| 48 | subdirectory of the check-out root, named with the setting name. |
| 49 | The contents of the file is the |
| 50 | value of the setting, and these files are checked in, committed, merged, |
| 51 | and so on, as with any other file. |
| 52 | |
| 53 | Where a setting is a list of values, such as <tt>ignore-glob</tt>, you |
| 54 | can use a newline as a separator as well as a comma. |
| 55 |