-Fix several incorrect uses of `i.e.'

With some other changes to sentences here and there as I found appropriate.

20 files changed, 51 insertions, 52 deletions

diff --git a/src/include/gnunet_ats_service.h b/src/include/gnunet_ats_service.h
index 92572c72b..68ba8e6b2 100644
--- a/src/include/gnunet_ats_service.h
+++ b/src/include/gnunet_ats_service.h
@@ -94,7 +94,7 @@ struct GNUNET_ATS_Properties
 
   /**
    * Distance on network layer (required for distance-vector routing)
-   * in hops.  Zero for direct connections (i.e. plain TCP/UDP).
+   * in hops.  Zero for direct connections (e.g. plain TCP/UDP).
    */
   unsigned int distance;
 
@@ -136,7 +136,7 @@ struct GNUNET_ATS_PropertiesNBO
 
   /**
    * Distance on network layer (required for distance-vector routing)
-   * in hops.  Zero for direct connections (i.e. plain TCP/UDP).
+   * in hops.  Zero for direct connections (e.g. plain TCP/UDP).
    */
   uint32_t distance GNUNET_PACKED;
 
@@ -308,7 +308,7 @@ struct GNUNET_ATS_AddressRecord;
  *
  * @param sh handle
  * @param address the address
- * @param session session handle (if available, i.e. for incoming connections)
+ * @param session session handle (if available, e.g for incoming connections)
  * @param prop performance data for the address
  * @return handle to the address representation inside ATS, NULL
  *         on error (i.e. ATS knows this exact address already, or
diff --git a/src/include/gnunet_ats_transport_service.h b/src/include/gnunet_ats_transport_service.h
index b5848a36a..fd821baef 100644
--- a/src/include/gnunet_ats_transport_service.h
+++ b/src/include/gnunet_ats_transport_service.h
@@ -85,7 +85,7 @@ struct GNUNET_ATS_Properties
 
   /**
    * Distance on network layer (required for distance-vector routing)
-   * in hops.  Zero for direct connections (i.e. plain TCP/UDP).
+   * in hops.  Zero for direct connections (e.g. plain TCP/UDP).
    */
   uint32_t distance;
 
diff --git a/src/include/gnunet_client_lib.h b/src/include/gnunet_client_lib.h
index aaa1f4a74..2ecd38b04 100644
--- a/src/include/gnunet_client_lib.h
+++ b/src/include/gnunet_client_lib.h
@@ -56,7 +56,7 @@ extern "C"
  *         #GNUNET_NO if the service is (definitively) down,
  *         #GNUNET_SYSERR if the configuration does not give us
  *          the necessary information about the service, or if
- *          we could not check (i.e. socket() failed)
+ *          we could not check (e.g. socket() failed)
  */
 int
 GNUNET_CLIENT_test (const struct GNUNET_CONFIGURATION_Handle *cfg,
diff --git a/src/include/gnunet_container_lib.h b/src/include/gnunet_container_lib.h
index 0d81abfd3..c8930746d 100644
--- a/src/include/gnunet_container_lib.h
+++ b/src/include/gnunet_container_lib.h
@@ -161,7 +161,7 @@ enum EXTRACTOR_MetaFormat
  *
  * @param cls closure (user-defined)
  * @param plugin_name name of the plugin that produced this value;
- *        special values can be used (i.e. '<zlib>' for zlib being
+ *        special values can be used (e.g. '<zlib>' for zlib being
  *        used in the main libextractor library and yielding
  *        meta data).
  * @param type libextractor-type describing the meta data
@@ -484,7 +484,7 @@ GNUNET_CONTAINER_meta_data_test_equal (
  *
  * @param md metadata to extend
  * @param plugin_name name of the plugin that produced this value;
- *        special values can be used (i.e. '<zlib>' for zlib being
+ *        special values can be used (e.g. '<zlib>' for zlib being
  *        used in the main libextractor library and yielding
  *        meta data).
  * @param type libextractor-type describing the meta data
@@ -693,7 +693,7 @@ GNUNET_CONTAINER_meta_data_get_serialized_size (
  *
  * @param input serialized meta-data.
  * @param size number of bytes available
- * @return MD on success, NULL on error (i.e.
+ * @return MD on success, NULL on error (e.g.
  *         bad format)
  */
 struct GNUNET_CONTAINER_MetaData *
@@ -2441,7 +2441,7 @@ GNUNET_CONTAINER_multihashmap32_iterator_destroy (
  * Insertion sort of @a element into DLL from @a head to @a tail
  * sorted by @a comparator.
  *
- * @param TYPE element type of the elements, i.e. `struct ListElement`
+ * @param TYPE element type of the elements, e.g. `struct ListElement`
  * @param comparator function like memcmp() to compare elements; takes
  *                   three arguments, the @a comparator_cls and two elements,
  *                   returns an `int` (-1, 0 or 1)
diff --git a/src/include/gnunet_crypto_lib.h b/src/include/gnunet_crypto_lib.h
index 2a552e212..43cdfdfac 100644
--- a/src/include/gnunet_crypto_lib.h
+++ b/src/include/gnunet_crypto_lib.h
@@ -945,7 +945,7 @@ GNUNET_CRYPTO_hash_get_bit_rtl (const struct GNUNET_HashCode *code,
 /**
  * @ingroup hash
  * Determine how many low order bits match in two
- * `struct GNUNET_HashCodes`.  i.e. - 010011 and 011111 share
+ * `struct GNUNET_HashCodes`.  e.g. - 010011 and 011111 share
  * the first two lowest order bits, and therefore the
  * return value is two (NOT XOR distance, nor how many
  * bits match absolutely!).
@@ -2048,7 +2048,7 @@ struct GNUNET_CRYPTO_RsaSignature;
 /**
  * Create a new private key. Caller must free return value.
  *
- * @param len length of the key in bits (i.e. 2048)
+ * @param len length of the key in bits (e.g. 2048)
  * @return fresh private key
  */
 struct GNUNET_CRYPTO_RsaPrivateKey *
diff --git a/src/include/gnunet_curl_lib.h b/src/include/gnunet_curl_lib.h
index f291d6b14..f51e4b503 100644
--- a/src/include/gnunet_curl_lib.h
+++ b/src/include/gnunet_curl_lib.h
@@ -68,7 +68,7 @@ struct GNUNET_CURL_DownloadBuffer
 
   /**
    * Error code (based on libc errno) if we failed to download
-   * (i.e. response too large).
+   * (e.g. response too large).
    */
   int eno;
 };
diff --git a/src/include/gnunet_dht_service.h b/src/include/gnunet_dht_service.h
index ea3ea92fa..95d30ae6f 100644
--- a/src/include/gnunet_dht_service.h
+++ b/src/include/gnunet_dht_service.h
@@ -178,7 +178,7 @@ GNUNET_DHT_put (struct GNUNET_DHT_Handle *handle,
  * has not yet been sent to the service, cancelling the PUT will stop
  * this from happening (but there is no way for the user of this API
  * to tell if that is the case).  The only use for this API is to
- * prevent a later call to 'cont' from #GNUNET_DHT_put (i.e. because
+ * prevent a later call to 'cont' from #GNUNET_DHT_put (e.g. because
  * the system is shutting down).
  *
  * @param ph put operation to cancel ('cont' will no longer be called)
diff --git a/src/include/gnunet_getopt_lib.h b/src/include/gnunet_getopt_lib.h
index b37827ccc..731be4159 100644
--- a/src/include/gnunet_getopt_lib.h
+++ b/src/include/gnunet_getopt_lib.h
@@ -83,7 +83,7 @@ struct GNUNET_GETOPT_CommandLineProcessorContext
  *
  * @param ctx context for all options
  * @param scls specific closure (for this processor)
- * @param option long name of the option (i.e. "config" for --config)
+ * @param option long name of the option (e.g. "config" for --config)
  * @param value argument, NULL if none was given
  * @return #GNUNET_OK to continue processing other options, #GNUNET_SYSERR to abort
  */
diff --git a/src/include/gnunet_gnsrecord_lib.h b/src/include/gnunet_gnsrecord_lib.h
index aff56146e..61cbac2ca 100644
--- a/src/include/gnunet_gnsrecord_lib.h
+++ b/src/include/gnunet_gnsrecord_lib.h
@@ -308,7 +308,7 @@ GNUNET_GNSRECORD_string_to_value (uint32_t type, const char *s, void **data,
 
 
 /**
- * Convert a type name (i.e. "AAAA") to the corresponding number.
+ * Convert a type name (e.g. "AAAA") to the corresponding number.
  *
  * @param dns_typename name to convert
  * @return corresponding number, UINT32_MAX on error
@@ -318,7 +318,7 @@ GNUNET_GNSRECORD_typename_to_number (const char *dns_typename);
 
 
 /**
- * Convert a type number (i.e. 1) to the corresponding type string (i.e. "A")
+ * Convert a type number to the corresponding type string (e.g. 1 to "A")
  *
  * @param type number of a type to convert
  * @return corresponding typestring, NULL on error
diff --git a/src/include/gnunet_gnsrecord_plugin.h b/src/include/gnunet_gnsrecord_plugin.h
index 1435bc4b3..aec22c3af 100644
--- a/src/include/gnunet_gnsrecord_plugin.h
+++ b/src/include/gnunet_gnsrecord_plugin.h
@@ -81,7 +81,7 @@ typedef int
 
 
 /**
- * Function called to convert a type name (i.e. "AAAA") to the
+ * Function called to convert a type name (e.g. "AAAA") to the
  * corresponding number.
  *
  * @param cls closure
@@ -94,8 +94,8 @@ typedef uint32_t
 
 
 /**
- * Function called to convert a type number (i.e. 1) to the
- * corresponding type string (i.e. "A")
+ * Function called to convert a type number to the
+ * corresponding type string (e.g. 1 to "A")
  *
  * @param cls closure
  * @param type number of a type to convert
diff --git a/src/include/gnunet_identity_service.h b/src/include/gnunet_identity_service.h
index 2974568db..c123983e2 100644
--- a/src/include/gnunet_identity_service.h
+++ b/src/include/gnunet_identity_service.h
@@ -210,13 +210,12 @@ GNUNET_IDENTITY_ego_get_public_key (struct GNUNET_IDENTITY_Ego *ego,
  * with 'NULL' for @a ego. That does NOT mean that the callback won't
  * be invoked in the future or that there was an error.
  *
- * When used with #GNUNET_IDENTITY_create or #GNUNET_IDENTITY_get,
- * this function is only called ONCE, and 'NULL' being passed in
- * @a ego does indicate an error (i.e. name is taken or no default
- * value is known).  If @a ego is non-NULL and if '*ctx'
- * is set in those callbacks, the value WILL be passed to a subsequent
- * call to the identity callback of #GNUNET_IDENTITY_connect (if
- * that one was not NULL).
+ * When used with #GNUNET_IDENTITY_create or #GNUNET_IDENTITY_get, this
+ * function is only called ONCE, and 'NULL' being passed in @a ego does
+ * indicate an error (for example because name is taken or no default value is
+ * known).  If @a ego is non-NULL and if '*ctx' is set in those callbacks, the
+ * value WILL be passed to a subsequent call to the identity callback of
+ * #GNUNET_IDENTITY_connect (if that one was not NULL).
  *
  * When an identity is renamed, this function is called with the
  * (known) @a ego but the NEW @a name.
@@ -768,7 +767,7 @@ struct GNUNET_IDENTITY_EgoSuffixLookup;
 
 /**
  * Obtain the ego with the maximum suffix match between the
- * ego's name and the given domain name @a suffix.  I.e., given
+ * ego's name and the given domain name @a suffix.  For example, given
  * a @a suffix "a.b.c" and egos with names "d.a.b.c", "b.c" and "c",
  * we return the ego for "b.c".
  *
diff --git a/src/include/gnunet_mq_lib.h b/src/include/gnunet_mq_lib.h
index 710664fe7..37bba8c1b 100644
--- a/src/include/gnunet_mq_lib.h
+++ b/src/include/gnunet_mq_lib.h
@@ -227,23 +227,23 @@ enum GNUNET_MQ_Error
 enum GNUNET_MQ_PriorityPreferences
 {
   /**
-   * Lowest priority, i.e. background traffic (i.e. NSE, FS).
+   * Lowest priority, i.e. background traffic (e.g. NSE, FS).
    * This is the default!
    */
   GNUNET_MQ_PRIO_BACKGROUND = 0,
 
   /**
-   * Best-effort traffic (i.e. CADET relay, DHT)
+   * Best-effort traffic (e.g. CADET relay, DHT)
    */
   GNUNET_MQ_PRIO_BEST_EFFORT = 1,
 
   /**
-   * Urgent traffic (local peer, i.e. Conversation).
+   * Urgent traffic (local peer, e.g. Conversation).
    */
   GNUNET_MQ_PRIO_URGENT = 2,
 
   /**
-   * Highest priority, control traffic (i.e. CORE/CADET KX).
+   * Highest priority, control traffic (e.g. CORE/CADET KX).
    */
   GNUNET_MQ_PRIO_CRITICAL_CONTROL = 3,
 
diff --git a/src/include/gnunet_network_lib.h b/src/include/gnunet_network_lib.h
index e40dacde7..97ab64add 100644
--- a/src/include/gnunet_network_lib.h
+++ b/src/include/gnunet_network_lib.h
@@ -561,7 +561,7 @@ GNUNET_NETWORK_fdset_destroy (struct GNUNET_NETWORK_FDSet *fds);
 /**
  * Test if the given @a port is available.
  *
- * @param ipproto transport protocol to test (i.e. IPPROTO_TCP)
+ * @param ipproto transport protocol to test (e.g. IPPROTO_TCP)
  * @param port port number to test
  * @return #GNUNET_OK if the port is available, #GNUNET_NO if not
  */
diff --git a/src/include/gnunet_reclaim_plugin.h b/src/include/gnunet_reclaim_plugin.h
index 2ba8fc8a0..11d5d76f7 100644
--- a/src/include/gnunet_reclaim_plugin.h
+++ b/src/include/gnunet_reclaim_plugin.h
@@ -92,8 +92,8 @@ typedef uint32_t (*GNUNET_RECLAIM_AttributeTypenameToNumberFunction) (
 
 
 /**
- * Function called to convert a type number (i.e. 1) to the
- * corresponding type string
+ * Function called to convert a type number to the
+ * corresponding type string (e.g. 1 to "A")
  *
  * @param cls closure
  * @param type number of a type to convert
@@ -154,8 +154,8 @@ typedef uint32_t (*GNUNET_RECLAIM_CredentialTypenameToNumberFunction) (
 
 
 /**
- * Function called to convert a type number (i.e. 1) to the
- * corresponding type string
+ * Function called to convert a type number to the
+ * corresponding type string (e.g. 1 to "A")
  *
  * @param cls closure
  * @param type number of a type to convert
@@ -253,8 +253,8 @@ typedef uint32_t (*GNUNET_RECLAIM_PresentationTypenameToNumberFunction) (
 
 
 /**
- * Function called to convert a type number (i.e. 1) to the
- * corresponding type string
+ * Function called to convert a type number to the
+ * corresponding type string (e.g. 1 to "A")
  *
  * @param cls closure
  * @param type number of a type to convert
diff --git a/src/include/gnunet_strings_lib.h b/src/include/gnunet_strings_lib.h
index cc655d0b0..955a3afca 100644
--- a/src/include/gnunet_strings_lib.h
+++ b/src/include/gnunet_strings_lib.h
@@ -59,7 +59,7 @@ extern "C"
 /**
  * Convert a given fancy human-readable size to bytes.
  *
- * @param fancy_size human readable string (i.e. 1 MB)
+ * @param fancy_size human readable string (e.g. 1 MB)
  * @param size set to the size in bytes
  * @return #GNUNET_OK on success, #GNUNET_SYSERR on error
  */
@@ -72,7 +72,7 @@ GNUNET_STRINGS_fancy_size_to_bytes (const char *fancy_size,
  * Convert a given fancy human-readable time to our internal
  * representation.
  *
- * @param fancy_time human readable string (i.e. 1 minute)
+ * @param fancy_time human readable string (e.g. 1 minute)
  * @param rtime set to the relative time
  * @return #GNUNET_OK on success, #GNUNET_SYSERR on error
  */
@@ -87,7 +87,7 @@ GNUNET_STRINGS_fancy_time_to_relative (const char *fancy_time,
  * representation.  The human-readable time is expected to be
  * in local time, whereas the returned value will be in UTC.
  *
- * @param fancy_time human readable string (i.e. %Y-%m-%d %H:%M:%S)
+ * @param fancy_time human readable string (e.g. %Y-%m-%d %H:%M:%S)
  * @param atime set to the absolute time
  * @return #GNUNET_OK on success, #GNUNET_SYSERR on error
  */
@@ -548,7 +548,7 @@ GNUNET_STRINGS_to_address_ipv4 (const char *zt_addr,
  * `struct sockaddr`.
  *
  * @param addr the address
- * @param[out] af set to the parsed address family (i.e. AF_INET)
+ * @param[out] af set to the parsed address family (e.g. AF_INET)
  * @param[out] sa set to the parsed address
  * @return 0 on error, otherwise number of bytes in @a sa
  */
diff --git a/src/include/gnunet_testbed_service.h b/src/include/gnunet_testbed_service.h
index acdfb2034..acb444de4 100644
--- a/src/include/gnunet_testbed_service.h
+++ b/src/include/gnunet_testbed_service.h
@@ -485,7 +485,7 @@ GNUNET_TESTBED_controller_stop (struct GNUNET_TESTBED_ControllerProc *cproc);
  * @param event_mask bit mask with set of events to call 'cc' for;
  *                   or-ed values of "1LL" shifted by the
  *                   respective 'enum GNUNET_TESTBED_EventType'
- *                   (i.e.  "(1LL << GNUNET_TESTBED_ET_CONNECT) | ...")
+ *                   (e.g.  "(1LL << GNUNET_TESTBED_ET_CONNECT) | ...")
  * @param cc controller callback to invoke on events
  * @param cc_cls closure for cc
  * @return handle to the controller
@@ -1415,7 +1415,7 @@ typedef void
  * @param event_mask bit mask with set of events to call 'cc' for;
  *                   or-ed values of "1LL" shifted by the
  *                   respective 'enum GNUNET_TESTBED_EventType'
- *                   (i.e.  "(1LL << GNUNET_TESTBED_ET_CONNECT) || ...")
+ *                   (e.g.  "(1LL << GNUNET_TESTBED_ET_CONNECT) || ...")
  * @param cc controller callback to invoke on events; This callback is called
  *        for all peer start events even if GNUNET_TESTBED_ET_PEER_START isn't
  *        set in the event_mask as this is the only way get access to the
@@ -1463,7 +1463,7 @@ GNUNET_TESTBED_run (const char *host_filename,
  * @param event_mask bit mask with set of events to call 'cc' for;
  *                   or-ed values of "1LL" shifted by the
  *                   respective 'enum GNUNET_TESTBED_EventType'
- *                   (i.e.  "(1LL << GNUNET_TESTBED_ET_CONNECT) || ...")
+ *                   (e.g.  "(1LL << GNUNET_TESTBED_ET_CONNECT) || ...")
  * @param cc controller callback to invoke on events; This callback is called
  *        for all peer start events even if #GNUNET_TESTBED_ET_PEER_START isn't
  *        set in the event_mask as this is the only way get access to the
diff --git a/src/include/gnunet_time_lib.h b/src/include/gnunet_time_lib.h
index 38c372f23..b9e87fcbe 100644
--- a/src/include/gnunet_time_lib.h
+++ b/src/include/gnunet_time_lib.h
@@ -558,7 +558,7 @@ GNUNET_TIME_get_offset (void);
 
 
 /**
- * Return the current year (i.e. '2011').
+ * Return the current year (e.g. '2011').
  */
 unsigned int
 GNUNET_TIME_get_current_year (void);
diff --git a/src/include/gnunet_transport_communication_service.h b/src/include/gnunet_transport_communication_service.h
index af2e36b4d..81a382fb2 100644
--- a/src/include/gnunet_transport_communication_service.h
+++ b/src/include/gnunet_transport_communication_service.h
@@ -94,17 +94,17 @@ struct GNUNET_TRANSPORT_CommunicatorHandle;
 enum GNUNET_TRANSPORT_CommunicatorCharacteristics
 {
   /**
-   * Characteristics are unknown (i.e. DV).
+   * Characteristics are unknown (e.g. DV).
    */
   GNUNET_TRANSPORT_CC_UNKNOWN = 0,
 
   /**
-   * Transmission is reliabile (with ACKs), i.e. TCP/HTTP/HTTPS.
+   * Transmission is reliabile (with ACKs), e.g. TCP/HTTP/HTTPS.
    */
   GNUNET_TRANSPORT_CC_RELIABLE = 1,
 
   /**
-   * Transmission is unreliable (i.e. UDP)
+   * Transmission is unreliable (e.g. UDP)
    */
   GNUNET_TRANSPORT_CC_UNRELIABLE = 2
 };
diff --git a/src/include/gnunet_transport_plugin.h b/src/include/gnunet_transport_plugin.h
index 01b10f75c..3e6d1edc6 100644
--- a/src/include/gnunet_transport_plugin.h
+++ b/src/include/gnunet_transport_plugin.h
@@ -49,7 +49,7 @@
  * connections to a given peer.  Typically used by stateful plugins to
  * allow the service to refer to specific streams instead of a more
  * general notion of "some connection" to the given peer.  This is
- * useful since sometimes (i.e. for inbound TCP connections) a
+ * useful since sometimes (e.g. for inbound TCP connections) a
  * connection may not have an address that can be used for meaningful
  * distinction between sessions to the same peer.
  *
diff --git a/src/include/gnunet_tun_lib.h b/src/include/gnunet_tun_lib.h
index 0af9a1d3e..61880cea1 100644
--- a/src/include/gnunet_tun_lib.h
+++ b/src/include/gnunet_tun_lib.h
@@ -746,7 +746,7 @@ GNUNET_NETWORK_STRUCT_END
  * Initialize an IPv4 header.
  *
  * @param ip header to initialize
- * @param protocol protocol to use (i.e. IPPROTO_UDP)
+ * @param protocol protocol to use (e.g. IPPROTO_UDP)
  * @param payload_length number of bytes of payload that follow (excluding IPv4
  * header)
  * @param src source IP address to use
@@ -764,7 +764,7 @@ GNUNET_TUN_initialize_ipv4_header (struct GNUNET_TUN_IPv4Header *ip,
  * Initialize an IPv6 header.
  *
  * @param ip header to initialize
- * @param protocol protocol to use (i.e. IPPROTO_UDP)
+ * @param protocol protocol to use (e.g. IPPROTO_UDP)
  * @param payload_length number of bytes of payload that follow (excluding IPv4
  * header)
  * @param src source IP address to use