diff --git a/winsup/doc/ChangeLog b/winsup/doc/ChangeLog index e4b9d6b94..47d0893b8 100644 --- a/winsup/doc/ChangeLog +++ b/winsup/doc/ChangeLog @@ -1,3 +1,9 @@ +2015-02-03 Corinna Vinschen + + * utils.xml (regtool): Clarify save action. Add description for + restore action. + * new-features.xml (ov-new1.7.34): Add regtool restore. + 2015-02-03 Corinna Vinschen * Throughout, replace http with https as far as cygwin.com and diff --git a/winsup/doc/new-features.xml b/winsup/doc/new-features.xml index af9175e81..ed44b97a7 100644 --- a/winsup/doc/new-features.xml +++ b/winsup/doc/new-features.xml @@ -35,6 +35,10 @@ Add -k/--remove-default option to setfacl to remove all default ACL entries from an ACL. + +Add restore action to regtool. + + Make gethostbyname2 handle numeric host addresses as well as the reserved domain names "localhost" and "invalid" per RFC 6761. diff --git a/winsup/doc/utils.xml b/winsup/doc/utils.xml index 39d88f77c..e5f073013 100644 --- a/winsup/doc/utils.xml +++ b/winsup/doc/utils.xml @@ -1538,7 +1538,8 @@ Actions: unset KEY\VALUE removes VALUE from KEY load KEY\SUBKEY PATH load hive from PATH into new SUBKEY unload KEY\SUBKEY unload hive and remove SUBKEY - save KEY\SUBKEY PATH save SUBKEY into new hive PATH + save KEY\SUBKEY PATH save SUBKEY into new file PATH + restore KEY\SUBKEY PATH restore SUBKEY from file PATH Options for 'list' Action: @@ -1567,6 +1568,11 @@ Options for 'set' and 'unset' Actions: -K<c>, --key-separator[=]<c> set key separator to <c> instead of '\' +Options for 'restore' action: + + -f, --force restore even if open handles exist at or beneath the location + in the registry hierarchy to which KEY\SUBKEY points + Other Options: -h, --help output usage information and exit @@ -1673,7 +1679,13 @@ Example: regtool.exe get '\user\software\Microsoft\Clock\iFormat' unloads the file and removes the subkey. The save action saves a subkey into a registry - hive. + file. Ideally you append the suffix .reg to the file + so it gets automatically recognized as registry file by + Windows Explorer. + + The restore action restores a registry subkey + from a file saved via the aforementioned save action. + By default, the last "\" or "/" is assumed to be the separator between the key and the value. You can use the -K