Merged revisions 71955,71962 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/trunk

........
  r71955 | georg.brandl | 2009-04-26 08:01:04 +0200 (So, 26 Apr 2009) | 1 line

  Mostly formatting nits, and "and-ed together" -> "or-ed together" flags.
........
  r71962 | eric.smith | 2009-04-26 12:05:11 +0200 (So, 26 Apr 2009) | 1 line

  Note that the caller is resposible for freeing the result of PyOS_double_to_string.
........

Doc/c-api/conversion.rst

@@ -63,7 +63,7 @@ The following functions provide locale-independent string to number conversions.
    See the Unix man page :manpage:`strtod(2)` for details.
 
 
-.. cfunction:: char * PyOS_ascii_formatd(char *buffer, size_t buf_len, const char *format, double d)
+.. cfunction:: char* PyOS_ascii_formatd(char *buffer, size_t buf_len, const char *format, double d)
 
    Convert a :ctype:`double` to a string using the ``'.'`` as the decimal
    separator. *format* is a :cfunc:`printf`\ -style format string specifying the
@@ -118,13 +118,13 @@ The following functions provide locale-independent string to number conversions.
    See the Unix man page :manpage:`atof(2)` for details.
 
 
-.. cfunction:: char * PyOS_stricmp(char *s1, char *s2)
+.. cfunction:: char* PyOS_stricmp(char *s1, char *s2)
 
    Case insensitive comparison of strings. The function works almost
    identically to :cfunc:`strcmp` except that it ignores the case.
 
 
-.. cfunction:: char * PyOS_strnicmp(char *s1, char *s2, Py_ssize_t  size)
+.. cfunction:: char* PyOS_strnicmp(char *s1, char *s2, Py_ssize_t  size)
 
    Case insensitive comparison of strings. The function works almost
    identically to :cfunc:`strncmp` except that it ignores the case.