Resolve conflict

ChrisVine · ChrisVine · commit c79baf378747 · 2018-09-02T00:33:43.000+01:00
diff --git a/a-sync/helper/pipe.ss b/a-sync/helper/pipe.ss
@@ -55,7 +55,7 @@
 ;; 'port'.  It is mainly intended for use with pipes returned by
 ;; make-pipe, but can be used with any port.  It returns an
 ;; unspecified value - it will always succeed unless 'port' has been
-;; closed.  It will not throw an exception.
+;; closed.
 ;;
 ;; This procedure is first available in version 0.20 of this library.
 (define (set-cloexec! port)
diff --git a/docs/chez-a-sync.info b/docs/chez-a-sync.info
@@ -2135,7 +2135,7 @@ as an event using event-post!.
      the event-loop implementation, and is exported (along with
      make-pipe) as part of the event-loop library in case it is useful
      to users.  It returns an unspecified value - it will always succeed
-     unless 'port' has been closed.  It will not throw an exception.
+     unless 'port' has been closed.
 
      This procedure is first available in version 0.20 of this library.
 
@@ -3008,9 +3008,9 @@ Node: Top83
 Node: overview1235
 Node: coroutines4550
 Node: event loop23133
-Node: thread pool112967
-Node: compose131747
-Node: meeting138202
-Node: try152910
+Node: thread pool112934
+Node: compose131714
+Node: meeting138169
+Node: try152877
 
 End Tag Table
diff --git a/docs/event-loop.texi b/docs/event-loop.texi
@@ -1669,7 +1669,7 @@ make-pipe, but can be used with any port.  It is used internally by
 the event-loop implementation, and is exported (along with make-pipe)
 as part of the event-loop library in case it is useful to users.  It
 returns an unspecified value - it will always succeed unless 'port'
-has been closed.  It will not throw an exception.
+has been closed.
 
 This procedure is first available in version 0.20 of this library.
 @end deffn
diff --git a/docs/html/event-loop.html b/docs/html/event-loop.html

-Original file line number
+Diff line change
      the event-loop implementation, and is exported (along with
      make-pipe) as part of the event-loop library in case it is useful
      to users.  It returns an unspecified value - it will always succeed
 -     unless 'port' has been closed.  It will not throw an exception.
 +     unless 'port' has been closed.
      This procedure is first available in version 0.20 of this library.
 Node: overview1235
 Node: coroutines4550
 Node: event loop23133
 -Node: thread pool112967
 -Node: compose131747
 -Node: meeting138202
 -Node: try152910
 +Node: thread pool112934
 +Node: compose131714
 +Node: meeting138169
 +Node: try152877
 End Tag Table