Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
  • Loading branch information
vlajos committed Dec 4, 2014
1 parent 7dc454c commit f63ee53
Show file tree
Hide file tree
Showing 6 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion RELEASENOTES.md
Expand Up @@ -220,7 +220,7 @@
- General
- Added a CONTRIBUTING.rst file, following the suggestion of @justinclift
in GitHub #327.
- Removed dependecy on the httplib2 library; pyrax now only relies on the
- Removed dependency on the httplib2 library; pyrax now only relies on the
'requests' module for HTTP communication.
- Fixed a bug in folder size calculations. GitHub #302
- Removed a limit that only handled Rackspace vendor extensions. GitHub #315
Expand Down
2 changes: 1 addition & 1 deletion TODO
Expand Up @@ -2,4 +2,4 @@
* Add Cloud Files container sync
* Add support for Cloud Networks virtual interfaces

* Python 3 compatibilty
* Python 3 compatibility
2 changes: 1 addition & 1 deletion docs/cloud_files.md
Expand Up @@ -194,7 +194,7 @@ Try running this code; you should find that the retrieved text is identical usin


## Handling Objects in Nested Folders
Since Cloud Files does not have a hierachical folder structure, you can simulate it be including the full folder path in the object name. E.g., if your folder structure looks like:
Since Cloud Files does not have a hierarchical folder structure, you can simulate it be including the full folder path in the object name. E.g., if your folder structure looks like:

* base
* one
Expand Down
4 changes: 2 additions & 2 deletions docs/cloud_loadbalancers.md
Expand Up @@ -157,12 +157,12 @@ IMAPv4 | Version 4, the current version of IMAPS.
LDAP | The Lightweight Directory Access Protocol provides access to distributed directory information services over the Internet. This protocol is typically used to access a large set of hierarchical records, such as corporate email or a telephone directory.
LDAPS | The Lightweight Directory Access Protocol over Secure Socket Layer (SSL).
MYSQL | This protocol allows communication with MySQL, an open source database management system.
POP3 | The Post Office Protocol is one of the two most common protocols for communciation between email clients and email servers. Version 3 is the current standard of POP.
POP3 | The Post Office Protocol is one of the two most common protocols for communication between email clients and email servers. Version 3 is the current standard of POP.
POP3S | Post Office Protocol over Secure Socket Layer.
SFTP | The SSH File Transfer Protocol is a secure file transfer and management protocol. This protocol assumes the files are using a secure channel, such as SSH, and that the identity of the client is available to the protocol.
SMTP | The Simple Mail Transfer Protocol is used by electronic mail servers to send and receive email messages. Email clients use this protocol to relay messages to another computer or web server, but use IMAP or POP to send and receive messages.
TCP | The Transmission Control Protocol is a part of the Transport Layer protocol and is one of the core protocols of the Internet Protocol Suite. It provides a reliable, ordered delivery of a stream of bytes from one program on a computer to another program on another computer. Applications that require an ordered and reliable delivery of packets use this protocol.
TCP_CLIE (TCP_CLIENT_FIRST) | This protocol is similiar to TCP, but is more efficient when a client is expected to write the data first.
TCP_CLIE (TCP_CLIENT_FIRST) | This protocol is similar to TCP, but is more efficient when a client is expected to write the data first.
UDP | The User Datagram Protocol provides a datagram service that emphasizes speed over reliability, It works well with applications that provide security through other measures.
UDP_STRE (UDP_STREAM) | This protocol is designed to stream media over networks and is built on top of UDP.

Expand Down
2 changes: 1 addition & 1 deletion docs/cloud_servers.md
Expand Up @@ -168,7 +168,7 @@ Now that you have the image and flavor objects you want (actually, it's their `i

server = cs.servers.create("first_server", ubu_image.id, flavor_1GB.id)

If you wanted to create the server with your SSH key as described in the preceeding section, add it using the `key_name` parameter:
If you wanted to create the server with your SSH key as described in the preceding section, add it using the `key_name` parameter:

server = cs.servers.create("first_server", ubu_image.id, flavor_1GB.id,
key_name="my_key")
Expand Down
4 changes: 2 additions & 2 deletions docs/getting_started.md
Expand Up @@ -26,7 +26,7 @@ You can also install directly from GitHub (where the pyrax source code is hosted

The difference is that using the GitHub installation method installs the current trunk version, which has the latest changes, but may also be less stable.

To upgrade your installation in the future, re-run the same command, but this time add the `--upgrade` option to make sure that pyrax and any dependecies are updated to the newest available version.
To upgrade your installation in the future, re-run the same command, but this time add the `--upgrade` option to make sure that pyrax and any dependencies are updated to the newest available version.


## Set up Authentication
Expand Down Expand Up @@ -193,7 +193,7 @@ If the environment is then changed to 'public', pyrax switches to Rackspace auth


### Accessing Environment Information
Pyrax offers several methods for querying and modifying envrionments and their settings. To start, you can determine the current environment by calling `pyrax.get_environment()`. You can also get a list of all defined envrionments by calling `pyrax.list_environments()`. And as mentioned above, you can switch the current envrionment by calling `pyrax.set_environment(new_env_name)`.
Pyrax offers several methods for querying and modifying environments and their settings. To start, you can determine the current environment by calling `pyrax.get_environment()`. You can also get a list of all defined environments by calling `pyrax.list_environments()`. And as mentioned above, you can switch the current envrionment by calling `pyrax.set_environment(new_env_name)`.

To get the value of a setting, call `pyrax.get_setting(key)`. Normally you do not need to change settings in the middle of a session, but just in case you do, you can use the `pyrax.set_setting(key, val)` method. Both of these methods work on the current environment by default. You can get/set settings in other environments with those calls by passing in the envrionment name as the optional `env` parameter to those methods.

Expand Down

0 comments on commit f63ee53

Please sign in to comment.