Просмотр исходного кода

Grammar and spelling corrections.

git-svn-id: http://framework.zend.com/svn/framework/standard/trunk@15427 44c647ce-9c0f-0410-b52a-842ac1e357ba
wil 16 лет назад
Родитель
Сommit
3cd6c3e40e

+ 14 - 14
documentation/manual/en/module_specs/Zend_Service_Amazon_Ec2-Ebs.xml

@@ -24,7 +24,7 @@
     </para>
 
     <sect2 id="zend.service.amazon.ec2.ebs.creating">
-        <title>Create EBS Volues and Snapshots</title>
+        <title>Create EBS Volumes and Snapshots</title>
 
         <example id="zend.service.amazon.ec2.ebs.creating.volume">
             <title>Create a new EBS Volume</title>
@@ -33,7 +33,7 @@
                 want the EBS Volume to be in.
             </para>
             <para>
-                <code>createNewVolume</code> will return an array containg information
+                <code>createNewVolume</code> will return an array containing information
                 about the new Volume which includes the volumeId, size, zone, status
                 and createTime.
             </para>
@@ -51,7 +51,7 @@ $return = $ec2_ebs->createNewVolume(40, 'us-east-1a');
                 want the EBS Volume to be in.
             </para>
             <para>
-                <code>createVolumeFromSnapshot</code> will return an array containg information about
+                <code>createVolumeFromSnapshot</code> will return an array containing information about
                 the new Volume which includes the volumeId, size, zone, status, createTime and snapshotId.
             </para>
 
@@ -67,7 +67,7 @@ $return = $ec2_ebs->createVolumeFromSnapshot('snap-78a54011', 'us-east-1a');
                 Creating a Snapshot of an EBS Volume requires the volumeId of the EBS Volume.
             </para>
             <para>
-                <code>createSnapshot</code> will return an array containg information about the
+                <code>createSnapshot</code> will return an array containing information about the
                 new Volume Snapshot which includes the snapshotId, volumeId, status, startTime
                 and progress.
             </para>
@@ -80,7 +80,7 @@ $return = $ec2_ebs->createSnapshot('volumeId');
     </sect2>
 
     <sect2 id="zend.service.amazon.ec2.ebs.describing">
-        <title>Describing EBS Volues and Snapshots</title>
+        <title>Describing EBS Volumes and Snapshots</title>
 
         <example id="zend.service.amazon.ec2.ebs.describing.volume">
             <title>Describing an EBS Volume</title>
@@ -93,7 +93,7 @@ $return = $ec2_ebs->createSnapshot('volumeId');
             <para>
                 <code>describeVolume</code> will return an array with information about each Volume which
                 includes the volumeId, size, status and createTime. If the volume is attached to an instance,
-                an addition value of attachmentSet will be returned. Attachment set contains information
+                an addition value of attachmentSet will be returned. The attachment set contains information
                 about the instance that the EBS Volume is attached to, which includes volumeId, instanceId,
                 device, status and attachTime.
             </para>
@@ -108,7 +108,7 @@ $return = $ec2_ebs->describeVolume('volumeId');
             <title>Describe Attached Volumes</title>
             <para>
                 To return a list of EBS Volumes currently attached to a running instance you can call this method.
-                It will only return an EBS Volumes attached the passed in instanceId.
+                It will only return EBS Volumes attached to the instance with the passed in instanceId.
             </para>
             <para>
                 <code>describeAttachedVolumes</code> returns the same information as the <code>describeVolume</code>
@@ -126,12 +126,12 @@ $return = $ec2_ebs->describeAttachedVolumes('instanceId');
             <para>
                 <code>describeSnapshot</code> allows you to get information on an EBS Volume Snapshot
                 or a set of EBS Volume Snapshots. If nothing is passed in then it will return information
-                about all EBS Volume Snapshots. If only one EBS Volume Snapshot needs to be described it's
+                about all EBS Volume Snapshots. If only one EBS Volume Snapshot needs to be described its
                 snapshotId can be passed in while an array of EBS Volume Snapshot Id's can be passed in to
                 describe them.
             </para>
             <para>
-                <code>describeSnapshot</code> will return an array containg informaion about each EBS Volume Snapshot
+                <code>describeSnapshot</code> will return an array containing information about each EBS Volume Snapshot
                 which includes the snapshotId, volumeId, status, startTime and progress.
             </para>
 
@@ -168,7 +168,7 @@ $return = $ec2_ebs->attachVolume('volumeId', 'instanceid', '/dev/sdh');
             <title>Detaching an EBS Volume</title>
             <para>
                 <code>detachVolume</code> will detach an EBS Volume from a running Instance.
-                <code>detachVolume</code> required that you specify the volumeId with the optional
+                <code>detachVolume</code> requires that you specify the volumeId with the optional
                 instanceId and device name that was passed when attaching the volume. If you need to
                 force the detachment you can set the forth parameter to be true and it will force
                 the volume to detach.
@@ -186,11 +186,11 @@ $return = $ec2_ebs->detachVolume('volumeId');
         <note>
             <title>Forced Detach</title>
             <para>
-                You should only for a detach if the previous detachment attempt did not occur
-                cleanly(logging into an instance, unmounting the volume, and detaching normally).
+                You should only force a detach if the previous detachment attempt did not occur
+                cleanly (logging into an instance, unmounting the volume, and detaching normally).
                 This option can lead to data loss or a corrupted file system. Use this option
                 only as a last resort to detach a volume from a failed instance. The instance
-                will not have an opportunity to flush file system caches nor file system meta
+                will not have an opportunity to flush file system caches or file system meta
                 data. If you use this option, you must perform file system check and repair
                 procedures.
             </para>
@@ -218,7 +218,7 @@ $return = $ec2_ebs->deleteVolume('volumeId');
         <example id="zend.service.amazon.ec2.ebs.deleting.snapshot">
             <title>Deleting an EBS Volume Snapshot</title>
             <para>
-                <code>deleteSnapshot</code> will delete a EBS Volume Snapshot.
+                <code>deleteSnapshot</code> will delete an EBS Volume Snapshot.
             </para>
             <para>
                 <code>deleteSnapshot</code> returns booleen true or false.

+ 7 - 7
documentation/manual/en/module_specs/Zend_Service_Amazon_Ec2-Elasticip.xml

@@ -53,7 +53,7 @@ print $ip;
         </para>
         <para>
             <code>describe</code> returns an array that contains information on each Elastic IP
-            Address which contains the publicIp and the instaceId if it is assocated.
+            Address which contains the publicIp and the instanceId if it is assocated.
         </para>
 
         <programlisting role="php"><![CDATA[
@@ -80,7 +80,7 @@ $ip = $ec2_eip->describe('ip1');
 
         <programlisting role="php"><![CDATA[
 $ec2_eip = new Zend_Service_Amazon_Ec2_Elasticip('aws_key','aws_secret_key');
-$ec2_eip->release('ipaddress);
+$ec2_eip->release('ipaddress');
 ]]></programlisting>
     </example>
 
@@ -101,11 +101,11 @@ $ec2_eip->associate('instance_id', 'ipaddress');
 ]]></programlisting>
     </example>
 
-    <example id="zend.service.amazon.ec2.elasticip.disassocate">
-        <title>Disassocate an Elastic IP from an instance</title>
+    <example id="zend.service.amazon.ec2.elasticip.disassociate">
+        <title>Disassociate an Elastic IP from an instance</title>
         <para>
-            <code>disassocate</code> will disassocate an Elastic IP from an instance.
-            If you terminate an Instance it will automaticly disassocate the Elastic
+            <code>disassociate</code> will disassociate an Elastic IP from an instance.
+            If you terminate an Instance it will automaticly disassociate the Elastic
             IP address for you.
         </para>
         <para>
@@ -114,7 +114,7 @@ $ec2_eip->associate('instance_id', 'ipaddress');
 
         <programlisting role="php"><![CDATA[
 $ec2_eip = new Zend_Service_Amazon_Ec2_Elasticip('aws_key','aws_secret_key');
-$ec2_eip->disassocate('ipaddress');
+$ec2_eip->disassociate('ipaddress');
 ]]></programlisting>
     </example>
 

+ 7 - 8
documentation/manual/en/module_specs/Zend_Service_Amazon_Ec2-Image.xml

@@ -4,8 +4,7 @@
     <title>Zend_Service_Amazon_Ec2: Amazon Machine Images (AMI)</title>
     <para>
         Amazon Machine Images (AMIs) are preconfigured with an ever-growing list
-        of operating systems. We work with our partners and community to provide
-        you with the most choice possible.
+        of operating systems.
     </para>
 
     <sect2 id="zend.service.amazon.ec2.images.info">
@@ -42,7 +41,7 @@ $ip = $ec2_img->register('imageLocation');
 
             <programlisting role="php"><![CDATA[
 $ec2_img = new Zend_Service_Amazon_Ec2_Image('aws_key','aws_secret_key');
-$ip = $ec2_img->deregister($imageId);
+$ip = $ec2_img->deregister('imageId');
 ]]></programlisting>
         </example>
 
@@ -114,12 +113,12 @@ $ip = $ec2_img->deregister($imageId);
             <para>
                 <code>describe</code> returns an array for all the images that match the critera that was
                 passed in. The array contains the imageId, imageLocation, imageState, imageOwnerId, isPublic,
-                architecture, imageTYpe, kernelId, ramdiskId and platform.
+                architecture, imageType, kernelId, ramdiskId and platform.
             </para>
 
             <programlisting role="php"><![CDATA[
 $ec2_img = new Zend_Service_Amazon_Ec2_Image('aws_key','aws_secret_key');
-$ip = $ec2_img->allocate();
+$ip = $ec2_img->describe();
 ]]></programlisting>
         </example>
     </sect2>
@@ -164,7 +163,7 @@ $ip = $ec2_img->allocate();
             </table>
             </para>
             <para>
-                <code>modifyAttribute</code> returns boolean ture or false.
+                <code>modifyAttribute</code> returns boolean true or false.
             </para>
             <programlisting role="php"><![CDATA[
 $ec2_img = new Zend_Service_Amazon_Ec2_Image('aws_key','aws_secret_key');
@@ -189,7 +188,7 @@ $return = $ec2_img->modifyAttribute('imageId',
         <example id="zend.service.amazon.ec2.images.attribute.reset">
             <title>Reset an AMI Attribute</title>
             <para>
-                <code>resetAttribute</code> will reest the attirbute of an AMI to its default value.
+                <code>resetAttribute</code> will reset the attribute of an AMI to its default value.
                 <emphasis>The productCodes attribute cannot be reset.</emphasis>
             </para>
             <programlisting role="php"><![CDATA[
@@ -206,7 +205,7 @@ $return = $ec2_img->resetAttribute('imageId', 'launchPermission');
                 productCodes are supported.
             </para>
             <para>
-                <code>describeAttribute</code> returns an array with the the value of the attirbute
+                <code>describeAttribute</code> returns an array with the value of the attribute
                 that was requested.
             </para>
             <programlisting role="php"><![CDATA[

+ 4 - 4
documentation/manual/en/module_specs/Zend_Service_Amazon_Ec2-Instance.xml

@@ -29,7 +29,7 @@
             <title>Instance Types</title>
             <para>
                 The instance types are defined as constants in the code. Column eight
-                in the table is the defined constanc name
+                in the table is the defined constant name
             </para>
         </note>
         <table id="zend.service.amazon.ec2.instance.types-table">
@@ -176,7 +176,7 @@
     <sect2 id="zend.service.amazon.ec2.instance.operations">
         <title>Running Amazon EC2 Instances</title>
         <para>
-            This section describes the operation methods maintaing Amazon EC2 Instances.
+            This section describes the operation methods for maintaining Amazon EC2 Instances.
         </para>
 
         <example id="zend.service.amazon.ec2.instance.operations.run">
@@ -223,8 +223,8 @@
                             <entry><code>keyName</code></entry>
                             <entry><para>
                                 Name of the key pair with which to launch instances.
-                                If you do not provide a key, access to the instance will
-                                leave it inaccessible.
+                                If you do not provide a key, all instances will
+                                be inaccessible.
                             </para></entry>
                             <entry><para>No</para></entry>
                         </row>