From 38dda9e9dec3108d1ba801b4a69510bfed962f22 Mon Sep 17 00:00:00 2001 From: Laurent Bercot Date: Fri, 19 Dec 2014 01:57:12 +0000 Subject: Doc fixes --- doc/index.html | 6 +++--- doc/libs6lock/index.html | 14 +++++++------- doc/s6-ftrig-notify.html | 2 +- doc/s6-setlock.html | 2 +- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/doc/index.html b/doc/index.html index 9d03f43..6aab8e8 100644 --- a/doc/index.html +++ b/doc/index.html @@ -175,7 +175,7 @@ synchronization. @@ -236,8 +236,8 @@ traditional init system for Linux.
  • Upstart is a well-known init system for Linux, with complete service management, that comes with the Ubuntu distribution. It includes a coffee machine and the kitchen sink.
    • -
  • Because Upstart wasn't bloated or unreliable enough, someone came up with -systemd, yet another Linux init system.
    • +
  • Because Upstart wasn't complex enough, someone came up with +systemd, which is a problem in its own category.
  • The various BSD flavors have their own style of init.
  • MacOS X has its own init spaghetti monster called diff --git a/doc/libs6lock/index.html b/doc/libs6lock/index.html index 3696b41..7237823 100644 --- a/doc/libs6lock/index.html +++ b/doc/libs6lock/index.html @@ -70,10 +70,10 @@ practices. 
    •  s6lock_t a = S6LOCK_ZERO ;
-struct taia deadline ;
+tain_t deadline ;
 
-taia_now_g() ;
-taia_addsec_g(&deadline, 2)
+tain_now_g() ;
+tain_addsec_g(&deadline, 2)
 
 char const *path = S6LOCK_IPCPATH ;
 s6lock_start_g(&a, path, &deadline) ;
@@ -128,8 +128,8 @@ s6lock_end(&a) ;
 
     uint16 id ;
 char const *file = "lockfile" ;
-struct taia limit ;
-struct taia deadline ;
+tain_t limit ;
+tain_t deadline ;
 
 int r = s6lock_acquire_sh_g (&a, &id, file, &limit, &deadline) ;
 /* int r = s6lock_acquire_ex_g (&a, &id, file, &limit, &deadline) ; */
@@ -236,7 +236,7 @@ number may have been transmitted from
 
     Synchronously waiting for locks 
    
 
 
    
- int s6lock_wait_or_g (s6lock_t *a, uint16 const *idlist, unsigned int n, struct taia const *deadline)  
    
+ int s6lock_wait_or_g (s6lock_t *a, uint16 const *idlist, unsigned int n, tain_t const *deadline)  
    
 Synchronously waits for one of the locks represented by the array pointed to
 by idlist of length n to be acquired. Returns -1 if it fails,
 or a nonnegative number on success, which is the index in idlist of the
@@ -245,7 +245,7 @@ function returns -1 ETIMEDOUT.
 
    
 
 
    
- int s6lock_wait_and_g (s6lock_t *a, uint16 const *idlist, unsigned int n, struct taia const *deadline)  
    
+ int s6lock_wait_and_g (s6lock_t *a, uint16 const *idlist, unsigned int n, tain_t const *deadline)  
    
 Synchronously waits for all of the locks represented by the array pointed to
 by idlist of length n to be acquired. Returns -1 if it fails and
 0 if it succeeds. If no result has been obtained by deadline, the
diff --git a/doc/s6-ftrig-notify.html b/doc/s6-ftrig-notify.html
index fa1e8b5..4f881eb 100644
--- a/doc/s6-ftrig-notify.html
+++ b/doc/s6-ftrig-notify.html
@@ -29,7 +29,7 @@ s6-ftrig-notify sends a series of events to a fifodir
 
 
    
 s6-ftrig-notify notifies all the current listeners in fifodir
-with all the characters in message, one by one.
+with all the characters in message.
 
    
 
 
     Notes 
    
diff --git a/doc/s6-setlock.html b/doc/s6-setlock.html
index bab3e23..f425656 100644
--- a/doc/s6-setlock.html
+++ b/doc/s6-setlock.html
@@ -40,7 +40,7 @@ s6-setlock takes a lock on a file, then executes into another program.
 exit 1 immediately. 
  
  •  -N : blocking lock. s6-setlock will wait until it can acquire the lock.
 This is the default. 
    • 
- 
  •  -t timeout : timed lock. If s6-setlock cannot acquire
+ 
  •  -t timeout : timed lock. If s6-setlock cannot acquire
 the lock after timeout milliseconds, it will exit 1. 
    • 
  
  •  -r : shared lock. Other shared locks on the same file will not prevent
 the lock from being acquired (but an exclusive lock will). 
    • 
-- 
cgit v1.2.3