Artifact
90f082b854effb4ce4320ff3d9644a740ab3ea1a684c41201fe9916a7e4e8476:
- File
www/backup.md
-
2020-12-13 05:32:58
— part of check-in
[fc300d5a9a]
on branch trunk
— Factored the iteration count out of the encrypted backup solution in
backup.md, so it isn't repeated between the backup and restore cases.
(user:
wyoung
size: 12091)
-
2020-12-14 20:38:37
— part of check-in
[959699bfb6]
on branch wiki-history
— Merge from trunk
(user:
george
size: 12091)
-
2021-02-14 21:28:19
— part of check-in
[0516f4d3c8]
on branch ui-local-diff
— Brought graham's ui-local-diff branch up to date with respect to trunk.
This is not a simple merge, because it had to accommodate several
conflicting changes, so it needs to be re-checked for sanity before
being merged down to trunk. Also, some of the changes I made simply
reduce the size of the resulting diff relative to trunk and need to be
reverted; these are primarily 2-line splits of "else/if" so the
branch-specific change doesn't repeat the following "if" condition,
which is now the "else if" condition. I think this sort of thing aids
understanding of the diff, even though it breaks the style guidelines.
(user:
wyoung
size: 12091)