Merge branch '4.1'

Conflicts:
	content/en_us/install-guide/ha_planning.dita
	content/en_us/shared/console_config_locating_config_file.dita

content/en_us/admin-guide/access_create_acct.dita

@@ -9,7 +9,7 @@
 		<metadata>
 			<keywords>
 				<keyword>Eucalyptus account creation</keyword>
-				<keyword>create account Eucalyputs</keyword>
+				<keyword>create account Eucalyptus</keyword>
 				<indexterm>account <indexterm>create</indexterm></indexterm>
 			</keywords>
 		</metadata>

content/en_us/admin-guide/bp_ha.dita

@@ -17,7 +17,7 @@
 	<conbody>
 		<p>High availability is the result of the combination of functionality
 			provided by Eucalyptus and the environmental and operational support
-			to maintain the constituent systems's proper operation. Eucalyptus
+			to maintain the constituent systems' proper operation. Eucalyptus
 			provides functionality aimed at enabling highly available
 			operation:</p>
 		<ul>

content/en_us/admin-guide/configure_advanced.dita

@@ -2,7 +2,7 @@
 <!DOCTYPE concept PUBLIC "-//OASIS//DTD DITA Concept//EN" "concept.dtd">
 <concept id="configure_advanced">
  <title>Advanced Configuration</title>
- <shortdesc>This section details advanced configuration for your Eualyptus cloud.</shortdesc>
+ <shortdesc>This section details advanced configuration for your Eucalyptus cloud.</shortdesc>
  <conbody>
   <p>Concept definition.</p>
  </conbody>

content/en_us/admin-guide/configure_advanced_storage_netapp_properties.dita

@@ -258,7 +258,7 @@
       <row>
        <entry>&lt;region&gt;.storage.autosnapshots</entry>
        <entry> Disable automatic snapshots. If set to “false” snapshot scheduling policy defined by
-        &lt;region&gt;.storage.snapshotpolicy is igonred and SC transmitts the default value
+        &lt;region&gt;.storage.snapshotpolicy is igonred and SC transmits the default value
         (“none”) in its place to the NetApp SAN. </entry>
        <entry>"true" (default) or "false"</entry>
       </row>

content/en_us/admin-guide/creds_create.dita

@@ -9,7 +9,7 @@
 		secret access key is generated. On each subsequent request to
 		get credentials, an existing active secret Key is returned. You
 		can also generate new keys using the
-		<cmdname>eucare-useraddkey</cmdname> command. </shortdesc>
+		<cmdname>euare-useraddkey</cmdname> command. </shortdesc>
 	<prolog>
 		<metadata>
 			<keywords>

content/en_us/admin-guide/groups.dita

@@ -3,7 +3,7 @@
 <!DOCTYPE reference PUBLIC "-//OASIS//DTD DITA Reference//EN" "reference.dtd">
 <reference id="groups">
 	<title>groups</title>
-	<shortdesc>Thi <codeph>groups</codeph> element specifies how to map LDAP/AD groups to Eucalyptus
+	<shortdesc>The <codeph>groups</codeph> element specifies how to map LDAP/AD groups to Eucalyptus
 		groups. It contains the elements listed in the following table. The meanings are similar to
 		those in accounting-groups element.</shortdesc>
 	<refbody>

content/en_us/admin-guide/groups_partition.dita

@@ -7,7 +7,7 @@
 	<shortdesc>Like accounting-groups, groups-partition specifies how to
 		map LDAP/AD groups to Eucalyptus accounts. However, in this
 		section you to manually specify which LDAP/AD groups you want to
-		map to Eucalyputs accounts. </shortdesc>
+		map to Eucalyptus accounts. </shortdesc>
 	<refbody>
 		<section><note type="important">If you use <codeph>groups-partition</codeph>,
 				remove the <codeph>accounting-groups</codeph> section. These two

content/en_us/admin-guide/manage_resources_walrus.dita

@@ -7,7 +7,7 @@
 	<taskbody>
 		<context>
 			<ul>
-				<li><b>Bucket ACLs:</b> Access Control Lists (ACLs) allow an account to explicity grant access to a bucket or
+				<li><b>Bucket ACLs:</b> Access Control Lists (ACLs) allow an account to explicitly grant access to a bucket or
 					object to another account. ACLs only work between accounts, not IAM users. You specify
 					accounts with the CanonicalID or the email address associated with the account (for
 					Eucalyptus this is the email of the account admin).</li>

content/en_us/admin-guide/managing_system.dita

@@ -3,7 +3,7 @@
 <!DOCTYPE concept PUBLIC "-//OASIS//DTD DITA Concept//EN" "concept.dtd">
 <concept id="managing_system">
 	<title>Manage Your Cloud</title>
-	<shortdesc>After you  install and intially configure Eucalyptus, there are some common adminstration tasks
+	<shortdesc>After you  install and initially configure Eucalyptus, there are some common administration tasks
 		you can perform. This section describes these tasks and associated concepts.</shortdesc>
 	<conbody>
 		<note type="tip">The <uicontrol>System Management</uicontrol> section of the

content/en_us/admin-guide/ops-monitoring.dita

@@ -16,7 +16,7 @@
   		<tbody>
   			<row>
   				<entry>Cloud Controller (CLC)</entry>
-  				<entry>8773 (web services), 8777 (PostGres)</entry>
+  				<entry>8773 (web services), 8777 (PostgreSQL)</entry>
   				<entry>eucalyptus-cloud, postgres</entry>
   			</row>
   			<row>

content/en_us/admin-guide/ops_oview.dita

@@ -2,7 +2,7 @@
 <!DOCTYPE concept PUBLIC "-//OASIS//DTD DITA Concept//EN" "concept.dtd">
 <concept id="ops_oview">
  <title>Operations</title>
- <shortdesc>This section contains concepts and tasks associated with operating your Eualyptus cloud.</shortdesc>
+ <shortdesc>This section contains concepts and tasks associated with operating your Eucalyptus cloud.</shortdesc>
  <conbody>
 
  </conbody>

content/en_us/admin-guide/ops_ts_install.dita

@@ -5,7 +5,7 @@
 	<shortdesc/>
 	<taskbody>
 		<context>
-			<p>Eucalyptus offers installation checks for anye Eucalyptus component or service (CLC, Walrus,
+			<p>Eucalyptus offers installation checks for any Eucalyptus component or service (CLC, Walrus,
 				SC, NC, SC, services, and more). When Eucalyptus encounters an error, it presents the problem to
 				the operator. These checks are used for install-time problems. They provide resolutions to some of the fault conditions. </p>
 

content/en_us/admin-guide/roles_tasks_create_role_application.dita

@@ -85,7 +85,7 @@ arn:aws:iam::408396244283:role/describe-instances</codeblock>
                    <steps>
                        <step>
                        <cmd>Create a policy and save it in a text file with a
-                           <codeph>.json</codeph> extenstion. The following example shows a
+                           <codeph>.json</codeph> extension. The following example shows a
                            policy that allows listing the contents of an S3 bucket called
                            "mybucket":</cmd>
                        <info>

content/en_us/admin-guide/sync.dita

@@ -34,7 +34,7 @@
 					</row>
 					<row>
 						<entry>clean-deletion</entry>
-						<entry>Parmeter denoting whether to remove identity
+						<entry>Parameter denoting whether to remove identity
 							entities from Eucalyptus when they are deleted from
 							LDAP. Set to true if you want Eucalyptus to remove
 							any identities once their counterparts in LDAP are

content/en_us/admin-guide/ts_common_problems.dita

@@ -2,7 +2,7 @@
 <!DOCTYPE concept PUBLIC "-//OASIS//DTD DITA Concept//EN" "concept.dtd">
 <concept id="ts_common_problems">
  <title>Common Problems</title>
- <shortdesc>This section describes common problems and work-arounds.</shortdesc>
+ <shortdesc>This section describes common problems and workarounds.</shortdesc>
  <conbody>
 
  </conbody>

content/en_us/cloudformation/cf_overview.dita

@@ -20,7 +20,7 @@
 				be set up and torn down in a repeatable manner.</p>
 		</section>
 		<section>
-			<title>How does Cloudformation Work?</title>
+			<title>How does CloudFormation Work?</title>
 			<p>CloudFormation manages a set of resources, called a stack, in batch operations (create,
 				update, or delete). Stacks are described in JSON templates, and can be simple, as the
 				following example:</p>
@@ -336,7 +336,7 @@
 			<codeblock>euca_conf  --register-service -T CloudFormation -H &lt;cloudformation_host_ip> -N &lt;service_name></codeblock>
 			<p>For example:</p>
 			<codeblock>euca_conf  --register-service -T CloudFormation -H 10.111.1.134 -N cfn</codeblock>
-			<p>Eucalyptus returns information similar to the folowing:</p>
+			<p>Eucalyptus returns information similar to the following:</p>
 			<codeblock>Created new partition 'cfn'
  SERVICE    cloudformation   	 cfn  		 cfn http://10.111.1.134:8773/services/
  CloudFormation    arn:euca:bootstrap:cfn:cloudformation:cfn/</codeblock>

content/en_us/cloudformation/cf_templates.dita

@@ -585,7 +585,7 @@
  		<title>IAM_Users_Groups_and_Policies.template</title>
  		<codeblock>{
   "AWSTemplateFormatVersion":"2010-09-09",
-  "Description":"AWS CloudFormation Sample Template IAM_Users_Groups_and_Policies: Sample template showing how to create IAM users, groups and policies. It creates a single user that is a member of a users group and an admin group. The groups each have different IAM policies associated with them. Note: This example also creates an AWSAccessKeyId/AWSSecretKey pair associated with the new user. The example is somewhat contrived since it creates all of the users and groups, typically you would be creating policies, users and/or groups that contain referemces to existing users or groups in your environment. Note that you will need to specify the CAPABILITY_IAM flag when you create the stack to allow this template to execute. You can do this through the AWS management console by clicking on the check box acknowledging that you understand this template creates IAM resources or by specifying the CAPABILITY_IAM flag to the cfn-create-stack command line tool or CreateStack API call. ",
+  "Description":"AWS CloudFormation Sample Template IAM_Users_Groups_and_Policies: Sample template showing how to create IAM users, groups and policies. It creates a single user that is a member of a users group and an admin group. The groups each have different IAM policies associated with them. Note: This example also creates an AWSAccessKeyId/AWSSecretKey pair associated with the new user. The example is somewhat contrived since it creates all of the users and groups, typically you would be creating policies, users and/or groups that contain references to existing users or groups in your environment. Note that you will need to specify the CAPABILITY_IAM flag when you create the stack to allow this template to execute. You can do this through the AWS management console by clicking on the check box acknowledging that you understand this template creates IAM resources or by specifying the CAPABILITY_IAM flag to the cfn-create-stack command line tool or CreateStack API call. ",
   "Parameters":{
     "Password":{
       "NoEcho":"true",

content/en_us/cloudformation/cf_tools.dita

@@ -97,7 +97,7 @@ public class DescribeStacksTest  {
 		<section>
 			<title>AWS Command Line Interface</title>
 			<p>You can use the AWS command line interface (CLI) with Eucalyptus CloudFormation. For example,
-				the folowing command describes a stack:</p>
+				the following command describes a stack:</p>
 			<codeblock>aws --endpoint http://10.111.1.134:8773/services/CloudFormation cloudformation describe-stacks</codeblock>
 			<p>Credential information is either also passed using flags or stored in a file referenced by the
 				<codeph>AWS_CONFIG_FILE</codeph> environment variable. Results from the previous command are in

content/en_us/console_image_detail.dita

@@ -13,7 +13,7 @@
         <shortdesc> Clicking the <uicontrol>Actions</uicontrol> button brings up a menu of
             actions that you can perform on the selected image.</shortdesc>
         <taskbody>
-            <context>The following menu actions are availabe:</context>
+            <context>The following menu actions are available:</context>
         </taskbody>
 
 

content/en_us/euca2ools-guide/clc_reports.dita

@@ -10,7 +10,7 @@
 
 		<p>Normally, you will just use <xref
 				href="eureport-generate-report.dita"/> command. If you want to
-			run reports agains the data warehouse, you need to export data from
+			run reports against the data warehouse, you need to export data from
 			the CLC using the <xref href="eureport-export-data.dita"/>
 			command.</p>
 		<note type="caution">Be careful if you use the

content/en_us/euca2ools-guide/euca-properties.dita

@@ -1305,7 +1305,7 @@
       </row>
       <row>
        <entry>www.https_port</entry>
-       <entry>Listen to HTTPs on this port.</entry>
+       <entry>Listen to HTTPS on this port.</entry>
       </row>
      </tbody>
     </tgroup>

content/en_us/euca2ools-guide/eureport-generate-report.dita

@@ -31,7 +31,7 @@
 					<tbody>
 						<row>
 							<entry><i>filename</i></entry>
-							<entry>Path to the resulting reporting reporting
+							<entry>Path to the resulting reporting 
 								file.</entry>
 							<entry align="center">No</entry>
 

content/en_us/euca2ools-guide/eustore-install-image.dita

@@ -6,7 +6,7 @@
 	<shortdesc>Installs an image on your cloud. If you don’t have administrator
 		credentials, you can install an image using the <codeph>–kernel</codeph>
 		and <codeph>–ramdisk</codeph> options to refer to a kernel id and
-		ramdisk ID already installed on the cloud. Eualyptus will ignore the
+		ramdisk ID already installed on the cloud. Eucalyptus will ignore the
 		kernel and ramdisk bundled with the image and refer to the previously
 		uploaded ones.</shortdesc>
 	<refbody>

content/en_us/euca2ools-guide/euwatch-get-stats.dita

@@ -40,7 +40,7 @@
 							<entry>Dimensions (one or more) along which the metric data was originally stored. If
 								no dimensions are specified, then the statistics belonging to the specified
 								non-dimensional metric will be returned. If you don't enter a value for dimensions,
-								Eualyptus assumes there are no dimensions.</entry>
+								Eucalyptus assumes there are no dimensions.</entry>
 							<entry align="center">No</entry>
 						</row>
 						<row>

content/en_us/euca2ools-release-notes/rn_euca2ools_features_3.1.0.dita

@@ -21,7 +21,7 @@
 					</row>
 					<row>
 						<entry>Image management tools added</entry>
-						<entry>We've added or enhaced commands for Eucalyptus' new Image Management Service, including
+						<entry>We've added or enhanced commands for Eucalyptus' new Image Management Service, including
 								<codeph>euca-install-image</codeph>,
 								<codeph>euca-import-volume</codeph>,
 								<codeph>euca-bundle-vol</codeph>, and

content/en_us/image-guide/img_concept_understanding_images.dita

@@ -49,7 +49,7 @@
 			are ready to run in your cloud. You can download them from the <xref
 				href="http://emis.eucalyptus.com/" format="html" scope="external">Eucalyptus Machine
 				Images</xref> page. Both HVM and paravirtual images are available there. Each
-			paravirtual image comes bundled with a correspoding EKI and ERI.</p>
+			paravirtual image comes bundled with a corresponding EKI and ERI.</p>
 
 		<p>If you find that the pre-packaged images don't meet your needs, you can migrate an image from
 			another cloud system (such as Amazon Web Services) or create your own image. See the

content/en_us/install-guide/config_drbd_sync.dita

@@ -3,7 +3,7 @@
 <!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN" "task.dtd">
 <task id="config_drbd_sync">
         <title>Skip Initial Device Synchronization</title>
-	<shortdesc>This topic details steps for skipping the intial device synchronization in <ph
+	<shortdesc>This topic details steps for skipping the initial device synchronization in <ph
 		conref="../shared/conrefs.dita#prod/product_ha"/>.</shortdesc>
         <taskbody>
                 <context>

content/en_us/install-guide/config_file_sync.dita

@@ -4,7 +4,7 @@
 <task id="config_drbd_sync">
 	<title>Synchronize Pairs Configuration</title>
 	<shortdesc>This topic details steps for keeping configuration files
-		sychronized between <ph conref="../shared/conrefs.dita#prod/product_ha"/> component pairs.</shortdesc>
+		synchronized between <ph conref="../shared/conrefs.dita#prod/product_ha"/> component pairs.</shortdesc>
 	<taskbody>
 		<context>
 			<note conref="../shared/conrefs.dita#prod/tech_preview"/>
@@ -19,7 +19,7 @@
 			<note type="note">Completion of this section is optional. You might
 				also want to expand on this example and generate your own more
 				complex configurations for other components, adding more groups
-				and including additional files in the sychronization tasks.
+				and including additional files in the synchronization tasks.
 			</note>
 		</context>
 		<steps>
@@ -95,7 +95,7 @@
 					compare and sync could be run via a cronjob which runs the
 					csync2 utility every 5 minutes. In the future, changes can
 					be made to the synchronized files on your primary Walrus and
-					these would be propogated to the other system by the
+					these would be propagated to the other system by the
 					cronjob. Add the following to /etc/cron.d/csync2 as root on
 					the primary Walrus:</cmd>
 				<info>

content/en_us/install-guide/configure_dell_equallogic_multipath_ha.dita

@@ -17,7 +17,7 @@
 				configured. Configuring multipathing on a non-multipathed system does not require a
 				restart of the SC, NC, or CLC. </note>
 			<p>
-				<note type="important">The Dell Equalogic SAN has separate paths for data and management.</note>
+				<note type="important">The Dell Equallogic SAN has separate paths for data and management.</note>
 			</p>
 			<p> The Dell Equallogic management interface is available for executing control
 				operations only. If your Dell Equallogic SAN is configured to use the management

content/en_us/install-guide/configure_imaging_service.dita

@@ -21,7 +21,7 @@
 				<li><i><b>Importing a raw disk image as a volume:</b></i> If you have a raw disk image
 					(containing either a data partition or a full operating system with a boot
 					record, e.g., an HVM image), you can use the Imaging Service to import this into
-					your your Eucalyptus cloud as a volume. This is accomplished with
+					your Eucalyptus cloud as a volume. This is accomplished with
 					euca-import-volume command. If the volume was populated with a bootable disk,
 					that volume can be snapshotted and registered as an EMI.</li>
 				<li><b><i>Importing a raw disk image as an instance:</i></b> If you have a raw disk image

content/en_us/install-guide/configure_netapp_multipath_ha.dita

@@ -20,7 +20,7 @@
 		</context>
 		<steps>
 			<step>
-				<cmd>Ensure that the mutipathd service is running on the SC and on each NC:</cmd>
+				<cmd>Ensure that the multipathd service is running on the SC and on each NC:</cmd>
 				<info>
 					<codeph>mpathconf --enable</codeph>
 				</info>
@@ -35,7 +35,7 @@
 				</info>
 			</step>
 			<step>
-				<cmd> Start the mutipathd service: </cmd>
+				<cmd> Start the multipathd service: </cmd>
 				<info>
 					<codeblock>service multipathd start</codeblock>
 				</info>

content/en_us/install-guide/configure_storage_controller.dita

@@ -90,7 +90,7 @@ SERVICEEVENT	6c1f7a0a-21c9-496c-bb79-23ddd5749222	SC blockstorageamanger not con
 					</info>
 				</step>
 				<step>
-					<cmd>Verify that the propery value is now: 'equallogic'</cmd>
+					<cmd>Verify that the property value is now: 'equallogic'</cmd>
 					<info>
 						<codeblock>euca-describe-properties | grep blockstorage</codeblock>
 					</info>
@@ -144,7 +144,7 @@ euca-modify-property -p &lt;partition>.storage.chapuser=[chap_username]</codeblo
 					</info>
 				</step>
 				<step>
-					<cmd>Verify that the propery value is now: 'das'</cmd>
+					<cmd>Verify that the property value is now: 'das'</cmd>
 					<info>
 						<codeblock>euca-describe-properties | grep blockstorage</codeblock>
 					</info>
@@ -240,7 +240,7 @@ euca-modify-property -p &lt;partition>.storage.chapuser=[chap_username]</codeblo
 						</info>
 					</step>
 					<step>
-						<cmd>Verify that the propery value is now: 'netapp'</cmd>
+						<cmd>Verify that the property value is now: 'netapp'</cmd>
 						<info>
 							<codeblock>euca-describe-properties | grep blockstorage</codeblock>
 						</info>
@@ -378,7 +378,7 @@ euca-modify-property -p &lt;partition>.storage.chapuser=&lt;Chap_username></code
 						</info>
 					</step>
 					<step>
-						<cmd>Verify that the propery value is now: 'netapp' </cmd>
+						<cmd>Verify that the property value is now: 'netapp' </cmd>
 						<info><codeblock>euca-describe-properties | grep blockstorage </codeblock></info>
 					</step>
 					<step>

content/en_us/install-guide/configure_storage_controller_ha.dita

@@ -89,7 +89,7 @@ SERVICEEVENT	6c1f7a0a-21c9-496c-bb79-23ddd5749222	SC blockstorageamanger not con
 					</info>
 				</step>
 				<step>
-					<cmd>Verify that the propery value is now: 'equallogic'</cmd>
+					<cmd>Verify that the property value is now: 'equallogic'</cmd>
 					<info>
 						<codeblock>euca-describe-properties | grep blockstorage</codeblock>
 					</info>
@@ -123,7 +123,7 @@ SERVICEEVENT	6c1f7a0a-21c9-496c-bb79-23ddd5749222	SC blockstorageamanger not con
 					</info>
 				</step>
 				<step>
-					<cmd>Verify that the propery value is now: 'das'</cmd>
+					<cmd>Verify that the property value is now: 'das'</cmd>
 					<info>
 						<codeblock>euca-describe-properties | grep blockstorage</codeblock>
 					</info>
@@ -316,7 +316,7 @@ euca-modify-property -p &lt;partition>.storage.chapuser=&lt;Chap_username></code
 					</step>
 					<step>
 						<cmd>Verify that Vserver administration is delegated to a user with administrative
-							privileges for that Vserver. If not, create a new new Vserver administrator account
+							privileges for that Vserver. If not, create a new Vserver administrator account
 							for use by Eucalyptus. </cmd>
 					</step>
 					<step>