Revision 97086fcd

b/kamaki/cli/commands/image.py
411 411
    only automatically (e.g. image id). There are also some custom user
412 412
    metadata, called properties.
413 413
    A register command creates a remote meta file at
414
       <container>:<image path>.meta
414
    .  <container>:<image path>.meta
415 415
    Users may download and edit this file and use it to re-register one or more
416 416
    images.
417 417
    In case of a meta file, runtime arguments for metadata or properties
b/kamaki/cli/commands/pithos.py
1609 1609
    .       /file permissions set F read=A,B write=C
1610 1610
    To share with everybody, use '*' instead of a user id or group.
1611 1611
    E.g. to make file F available to all pithos users:
1612
        /file permissions set F read=*
1612
    .   /file permissions set F read=*
1613 1613
    E.g. to make file F available for editing to all pithos users:
1614
        /file permissions set F write=*
1614
    .   /file permissions set F write=*
1615 1615
    """
1616 1616

  
1617 1617
    @errors.generic.all
b/kamaki/clients/cyclades/__init__.py
384 384

  
385 385
    def get_floating_ips(self):
386 386
        """
387
        :returns: (dict) {floating_ips:[
388
            {fixed_ip: ..., id: ..., instance_id: ..., ip: ..., pool: ...},
389
            ... ]}
387
        :returns: (dict) {floating_ips: [fixed_ip: , id: , ip: , pool: ]}
390 388
        """
391 389
        r = self.floating_ips_get()
392 390
        return r.json

Also available in: Unified diff