diff --git a/docs/config.rst b/docs/config.rst index b6c5ff9..d157be3 100644 --- a/docs/config.rst +++ b/docs/config.rst @@ -61,7 +61,7 @@ Pair Section sync`` is executed. See also :ref:`collections_tutorial`. The special values ``"from a"`` and ``"from b"``, tell vdirsyncer to try - autodiscovery on a specific storage. It means all the collections on side A / + autodiscovery on a specific storage. It means all the collections on side A / side B. If the collection you want to sync doesn't have the same name on each side, @@ -72,7 +72,7 @@ Pair Section Examples: - - ``collections = ["from b", "foo", "bar"]`` makes vdirsyncer synchronize all + - ``collections = ["from b", "foo", "bar"]`` makes vdirsyncer synchronize all the collections from side B, and also the collections named "foo" and "bar". - ``collections = ["from b", "from a"]`` makes vdirsyncer synchronize all diff --git a/docs/tutorial.rst b/docs/tutorial.rst index 522d674..e7d2c7c 100644 --- a/docs/tutorial.rst +++ b/docs/tutorial.rst @@ -176,8 +176,8 @@ as a file called ``color`` within the calendar folder. More information about collections ---------------------------------- -"Collection" is a collective term for addressbooks and calendars. A Cardav or -Caldav server can contains several "collections" which correspond to several +"Collection" is a collective term for addressbooks and calendars. A Cardav or +Caldav server can contains several "collections" which correspond to several addressbooks or calendar. Each collection from a storage has a "collection name", a unique identifier for each diff --git a/vdirsyncer/cli/__init__.py b/vdirsyncer/cli/__init__.py index 00a992f..0885429 100644 --- a/vdirsyncer/cli/__init__.py +++ b/vdirsyncer/cli/__init__.py @@ -17,7 +17,7 @@ cli_logger = logging.getLogger(__name__) click_log.basic_config("vdirsyncer") # add short option for the help option -click_context_settings = dict(help_option_names=['-h', '--help']) +click_context_settings = {"help_option_names": ["-h", "--help"]} class AppContext: diff --git a/vdirsyncer/storage/filesystem.py b/vdirsyncer/storage/filesystem.py index 8de243b..ec0ab52 100644 --- a/vdirsyncer/storage/filesystem.py +++ b/vdirsyncer/storage/filesystem.py @@ -181,7 +181,9 @@ class FilesystemStorage(Storage): logger.warning(f"Error executing external hook: {str(e)}") def _run_pre_deletion_hook(self, fpath): - logger.info(f"Calling pre_deletion_hook={self.pre_deletion_hook} with argument={fpath}") + logger.info( + f"Calling pre_deletion_hook={self.pre_deletion_hook} with argument={fpath}" + ) try: subprocess.call([self.pre_deletion_hook, fpath]) except OSError as e: