DOC: small fix in display in ndarray documentation
Merge branch 'master' of git://github.com/numpy/numpy into docs

* 'master' of git://github.com/numpy/numpy: (67 commits)
  DOC: fix typo in array flag docs.
  DOC : optional parenthesis
  DOC : added missing space in frexp docstring
  DOC : integer -> int doc nitpick
  DOC : do not abuse enum markup
  DOC : move shape to front to match rest of docs
  DOC : do not abuse enumeration for return types
  DOC : list type option in tensordot axes arg
  DOC: Give a more explicit reference to the .npy format documentation in the 'save' docstring.
  MAINT: cast PyArray_ITEMSIZE result to avoid warnings
  MAINT: Update printf statements in fortranobject.c
  DOC : minor changes to linspace docstring
  Improved PEP-8 compliance
  BUG: Closes #2015: diag returns ndarray
  BUG: digitize segfaults on TypeError
  Change pronoun in doc string from "his" to gender-neutral "their"
  BUG: Rename fft C functions to avoid name conflict
  TST: report relaxed strides setting alongside the numpy version and path at the beginning of nosetests
  BLD: Change Fortran version flag and string check
  DOC: fix typos and clarify multi_dot docstring..
  ...