Formatting fixes

docs/api.rst

@@ -11,17 +11,19 @@ General Section
 ---------------
 
 ::
+
     [general]
     status_path = ...
     #processes = 0
 
+
 - ``status_path``: A directory where vdirsyncer will store metadata for the
   next sync. The data is needed to determine whether a new item means it has
   been added on one side or deleted on the other.
 
- - ``processes``: Optional, defines the amount of maximal connections to use
-   for syncing.  By default there is no limit, which means vdirsyncer will try
-   to open a connection for each collection to be synced. The value ``0`` is
+- ``processes``: Optional, defines the amount of maximal connections to use for
+  syncing.  By default there is no limit, which means vdirsyncer will try to
+  open a connection for each collection to be synced. The value ``0`` is
   ignored. Setting this to ``1`` will only synchronize one collection at a
   time.
 
@@ -36,6 +38,7 @@ Pair Section
 ------------
 
 ::
+
     [pair pair_name]
     a = ...
     b = ...
@@ -43,10 +46,10 @@ Pair Section
 
 - ``a`` and ``b`` reference the storages to sync by their names.
 
-  - ``conflict_resolution``: Optional, define how conflicts should be handled.
-    A conflict occurs when one item changed on both sides since the last sync.
-    Valid values are ``a wins`` and ``b wins``. By default, vdirsyncer will
-    show an error and abort the synchronization.
+- ``conflict_resolution``: Optional, define how conflicts should be handled.  A
+  conflict occurs when one item changed on both sides since the last sync.
+  Valid values are ``a wins`` and ``b wins``. By default, vdirsyncer will show
+  an error and abort the synchronization.
 
 .. _storage_config:
 
@@ -54,6 +57,7 @@ Storage Section
 ---------------
 
 ::
+
     [storage storage_name]
     type = ...
 

vdirsyncer/storage/http.py

@@ -60,7 +60,6 @@ class HttpStorage(Storage):
 
     A simple example::
 
-        # HTTP CALENDAR
         [pair holidays]
         a = holidays_local
         b = holidays_remote