The branch, master has been updated
via 094862b8a67 s3/vfs_shadow_copy2.c: Fix typo in comment.
via 7b6e56b0f99 docs: Fix typo in vfs_ceph_snapshots man page.
from d566a4d3e10 replace: Remove crypt() reimplementation
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 094862b8a67c8f1a3d37c2838bb0d684d5858da8
Author: Karolin Seeger <[email protected]>
Date: Thu Sep 19 09:19:40 2019 +0200
s3/vfs_shadow_copy2.c: Fix typo in comment.
Signed-off-by: Karolin Seeger <[email protected]>
Reviewed-by: Björn Jacke <[email protected]>
Autobuild-User(master): Björn Jacke <[email protected]>
Autobuild-Date(master): Thu Sep 19 14:09:44 UTC 2019 on sn-devel-184
commit 7b6e56b0f990c01d5b7a948c42e7e66c2ac596c7
Author: Karolin Seeger <[email protected]>
Date: Thu Sep 19 09:18:44 2019 +0200
docs: Fix typo in vfs_ceph_snapshots man page.
Signed-off-by: Karolin Seeger <[email protected]>
Reviewed-by: Björn Jacke <[email protected]>
-----------------------------------------------------------------------
Summary of changes:
docs-xml/manpages/vfs_ceph_snapshots.8.xml | 2 +-
source3/modules/vfs_shadow_copy2.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
Changeset truncated at 500 lines:
diff --git a/docs-xml/manpages/vfs_ceph_snapshots.8.xml
b/docs-xml/manpages/vfs_ceph_snapshots.8.xml
index 7fa2806fd95..872b5237b84 100644
--- a/docs-xml/manpages/vfs_ceph_snapshots.8.xml
+++ b/docs-xml/manpages/vfs_ceph_snapshots.8.xml
@@ -35,7 +35,7 @@
The <command>vfs_ceph_snapshots</command> VFS module exposes
CephFS snapshots for use by Samba. When enabled, SMB clients
such as Windows Explorer's Previous Versions dialog, can
- enumerate snaphots and access them via "timewarp" tokens.
+ enumerate snapshots and access them via "timewarp" tokens.
</para>
<para>
diff --git a/source3/modules/vfs_shadow_copy2.c
b/source3/modules/vfs_shadow_copy2.c
index 36e3ead1b1d..5417c9f3b82 100644
--- a/source3/modules/vfs_shadow_copy2.c
+++ b/source3/modules/vfs_shadow_copy2.c
@@ -1005,7 +1005,7 @@ static char *shadow_copy2_do_convert(TALLOC_CTX *mem_ctx,
if (errno == ENOTDIR) {
/*
* This is a valid condition: We appended the
- * .snaphots/@GMT.. to a file name. Just try
+ * .snapshots/@GMT.. to a file name. Just try
* with the upper levels.
*/
continue;
--
Samba Shared Repository
