Skip to content

Commit

Permalink
Merge pull request #36 from omahs/patch-1
Browse files Browse the repository at this point in the history
fix typos
  • Loading branch information
lyz-code committed Jun 17, 2024
2 parents 4b3c5ef + 9c290f0 commit b283984
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion docs/coding/python/python_snippets.md
Original file line number Diff line number Diff line change
Expand Up @@ -543,7 +543,7 @@ datetime.datetime.now().strftime("%Y-%m-%dT%H:%M:%S")
| %S | Second as a zero-padded decimal number. 05 |
| %-S | Second as a decimal number. (Platform specific) 5 |
| %f | Microsecond as a decimal number, zero-padded on the left. 000000 |
| %z | UTC offset in the form +HHMM or -HHMM (empty string if the the object is naive). |
| %z | UTC offset in the form +HHMM or -HHMM (empty string if the object is naive). |
| %Z | Time zone name (empty string if the object is naive). |
| %j | Day of the year as a zero-padded decimal number. 273 |
| %-j | Day of the year as a decimal number. (Platform specific) 273 |
Expand Down
4 changes: 2 additions & 2 deletions docs/linux/zfs.md
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ In this example, the `maybee` file system is relocated from `tank/home` to `tank

The rename operation attempts an unmount/remount sequence for the file system and any descendent file systems. The rename command fails if the operation is unable to unmount an active file system. If this problem occurs, you must forcibly unmount the file system.

You'll loose the snapshots though, as explained below.
You'll lose the snapshots though, as explained below.

### [Rename the topmost dataset](https://www.solaris-cookbook.eu/solaris/solaris-zpool-rename/)

Expand Down Expand Up @@ -869,7 +869,7 @@ The following table summarizes the file or directory changes that are identified
## Create a cold backup of a series of datasets
If you've used the `-o keyformat=raw -o keylocation=file:///etc/zfs/keys/home.key` arguments to encrypt your datasets you can't use a `keyformat=passphase` encryption on the cold storage device. You need to copy those keys on the disk. One way of doing it is to:
If you've used the `-o keyformat=raw -o keylocation=file:///etc/zfs/keys/home.key` arguments to encrypt your datasets you can't use a `keyformat=passphrase` encryption on the cold storage device. You need to copy those keys on the disk. One way of doing it is to:
- Create a 100M LUKS partition protected with a passphrase where you store the keys.
Expand Down
2 changes: 1 addition & 1 deletion docs/newsletter/2022.md
Original file line number Diff line number Diff line change
Expand Up @@ -2612,7 +2612,7 @@
%S Second as a zero-padded decimal number. 05
%-S Second as a decimal number. (Platform specific) 5
%f Microsecond as a decimal number, zero-padded on the left. 000000
%z UTC offset in the form +HHMM or -HHMM (empty string if the the object is naive).
%z UTC offset in the form +HHMM or -HHMM (empty string if the object is naive).
%Z Time zone name (empty string if the object is naive).
%j Day of the year as a zero-padded decimal number. 273
%-j Day of the year as a decimal number. (Platform specific) 273
Expand Down

0 comments on commit b283984

Please sign in to comment.