cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From j..@apache.org
Subject git commit: updated refs/heads/master to d8103af
Date Wed, 10 Apr 2013 00:44:31 GMT
Updated Branches:
  refs/heads/master 6175f6e4e -> d8103afdf


Fixed typos

Signed-off-by: Joe Brockmeier <jzb@zonker.net>


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/d8103afd
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/d8103afd
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/d8103afd

Branch: refs/heads/master
Commit: d8103afdf6d501478b406b24e55a21017b36ab63
Parents: 6175f6e
Author: Pascal Borreli <pascal@borreli.com>
Authored: Tue Apr 9 22:01:26 2013 +0000
Committer: Joe Brockmeier <jzb@zonker.net>
Committed: Tue Apr 9 19:44:14 2013 -0500

----------------------------------------------------------------------
 docs/en-US/added-API-commands.xml                  |    2 +-
 docs/en-US/aws-ec2-introduction.xml                |    2 +-
 docs/en-US/building-documentation.xml              |    2 +-
 docs/en-US/building-marvin.xml                     |    2 +-
 docs/en-US/building-translation.xml                |    2 +-
 ...change-console-proxy-ssl-certificate-domain.xml |    2 +-
 docs/en-US/citrix-xenserver-installation.xml       |    2 +-
 docs/en-US/configure-package-repository.xml        |    2 +-
 docs/en-US/configure-vpn.xml                       |    2 +-
 docs/en-US/console-proxy.xml                       |    2 +-
 docs/en-US/hypervisor-host-install-libvirt.xml     |    2 +-
 ...hypervisor-host-install-network-openvswitch.xml |    2 +-
 docs/en-US/hypervisor-host-install-network.xml     |    4 ++--
 .../en-US/management-server-install-prepare-os.xml |    2 +-
 docs/en-US/management-server-lb.xml                |    2 +-
 docs/en-US/minimum-system-requirements.xml         |    2 +-
 docs/en-US/translating-documentation.xml           |    2 +-
 docs/en-US/using-sshkeys.xml                       |    2 +-
 docs/en-US/vmware-requirements.xml                 |    2 +-
 docs/en-US/writing-new-documentation.xml           |    4 ++--
 20 files changed, 22 insertions(+), 22 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d8103afd/docs/en-US/added-API-commands.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/added-API-commands.xml b/docs/en-US/added-API-commands.xml
index 208aac2..99635de 100644
--- a/docs/en-US/added-API-commands.xml
+++ b/docs/en-US/added-API-commands.xml
@@ -87,7 +87,7 @@
           <entry><para>suspendProject (Suspends a project)</para></entry>
           <entry><para>listProjects (Lists projects and provides detailed information
for listed
               projects)</para></entry>
-          <entry><para>addAccountToProject (Adds acoount to a project)</para></entry>
+          <entry><para>addAccountToProject (Adds account to a project)</para></entry>
         </row>
         <row>
           <entry><para>deleteAccountFromProject (Deletes account from the project)</para></entry>

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d8103afd/docs/en-US/aws-ec2-introduction.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/aws-ec2-introduction.xml b/docs/en-US/aws-ec2-introduction.xml
index 538c09d..4cf071b 100644
--- a/docs/en-US/aws-ec2-introduction.xml
+++ b/docs/en-US/aws-ec2-introduction.xml
@@ -45,7 +45,7 @@
         <para>Available in fresh installations of &PRODUCT;. Not available through
upgrade of previous versions.</para>
       </listitem>
       <listitem>
-        <para>Features such as Elastic IP (EIP) and Elastic Load Balacing (ELB) are
only available in an infrastructure
+        <para>Features such as Elastic IP (EIP) and Elastic Load Balancing (ELB) are
only available in an infrastructure
         with a Citrix NetScaler device. Users accessing a Zone with a NetScaler device will
need to use a 
         NetScaler-enabled network offering (DefaultSharedNetscalerEIP and ELBNetworkOffering).</para>
       </listitem>

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d8103afd/docs/en-US/building-documentation.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/building-documentation.xml b/docs/en-US/building-documentation.xml
index 4848266..8ee63b0 100644
--- a/docs/en-US/building-documentation.xml
+++ b/docs/en-US/building-documentation.xml
@@ -25,7 +25,7 @@
 <section id="building-documentation">
     <title>Building &PRODUCT; Documentation</title>
     <para>To build a specific guide, go to the source tree of the documentation in
/docs and identify the guide you want to build.</para>
-    <para>Currenlty there are four guides plus the release notes, all defined in publican
configuration files:</para>
+    <para>Currently there are four guides plus the release notes, all defined in publican
configuration files:</para>
     <programlisting>
         publican-adminguide.cfg
         publican-devguide.cfg

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d8103afd/docs/en-US/building-marvin.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/building-marvin.xml b/docs/en-US/building-marvin.xml
index 3332b16..e33c4cb 100644
--- a/docs/en-US/building-marvin.xml
+++ b/docs/en-US/building-marvin.xml
@@ -27,7 +27,7 @@
     <para>Marvin is built with Maven and is dependent on APIdoc. To build it do the
following in the root tree of &PRODUCT;:</para>
     <programlisting>mvn -P developer -pl :cloud-apidoc</programlisting>
     <programlisting>mvn -P developer -pl :cloud-marvin</programlisting>
-    <para>If successfull the build will have created the cloudstackAPI Python package
under tools/marvin/marvin/cloudstackAPI as well as a gziped Marvin package under tools/marvin
dist. To install the Python Marvin module do the following in tools/marvin:</para>
+    <para>If successful the build will have created the cloudstackAPI Python package
under tools/marvin/marvin/cloudstackAPI as well as a gziped Marvin package under tools/marvin
dist. To install the Python Marvin module do the following in tools/marvin:</para>
     <programlisting>sudo python ./setup.py install</programlisting>
     <para>The dependencies will be downloaded the Python module installed and you should
be able to use Marvin in Python. Check that you can import the module before starting to use
it.</para>
     <programlisting>$ python

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d8103afd/docs/en-US/building-translation.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/building-translation.xml b/docs/en-US/building-translation.xml
index 659c55f..dd66365 100644
--- a/docs/en-US/building-translation.xml
+++ b/docs/en-US/building-translation.xml
@@ -52,7 +52,7 @@
     how to <ulink url="http://rlandmann.fedorapeople.org/pug/sect-Users_Guide-Preparing_a_document_for_translation.html">prepare</ulink>
a document for translation.</para>
     <para>The basic command to execute to build the pot files for the developer guide
is:</para>
     <programlisting>publican update_pot --config=publican-devguide.cfg</programlisting>
-    <para>This will create a pot directory with pot files in it, one for each corresponding
xml files needed to build the guide. Once genereated, all pots files need to be configured
for translation using transifex this is best done by using the transifex client that you can
install with the following command (For RHEL and its derivatives):</para>
+    <para>This will create a pot directory with pot files in it, one for each corresponding
xml files needed to build the guide. Once generated, all pots files need to be configured
for translation using transifex this is best done by using the transifex client that you can
install with the following command (For RHEL and its derivatives):</para>
     <programlisting>yum install transifex-client</programlisting>
     <para>The transifex client is also available via PyPi and you can install it like
this:</para>
     <programlisting>easy_install transifex-client</programlisting>

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d8103afd/docs/en-US/change-console-proxy-ssl-certificate-domain.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/change-console-proxy-ssl-certificate-domain.xml b/docs/en-US/change-console-proxy-ssl-certificate-domain.xml
index 89796a2..3fd0501 100644
--- a/docs/en-US/change-console-proxy-ssl-certificate-domain.xml
+++ b/docs/en-US/change-console-proxy-ssl-certificate-domain.xml
@@ -32,7 +32,7 @@
             <listitem><para>Generate a new 2048-bit private key</para><programlisting>openssl
genrsa -des3 -out yourprivate.key 2048</programlisting></listitem>
             <listitem><para>Generate a new certificate CSR</para><programlisting>openssl
req -new -key yourprivate.key -out yourcertificate.csr</programlisting></listitem>
             <listitem><para>Head to the website of your favorite trusted Certificate
Authority, purchase an SSL certificate, and submit the CSR. You should receive a valid certificate
in return</para></listitem>
-            <listitem><para>Convert your private key format into PKCS#8 encrypted
format.</para><programlisting>openssl pkcs8 -topk8 -in yourprivate.key -out yourprivate.pkcs8.encryped.key</programlisting></listitem>
+            <listitem><para>Convert your private key format into PKCS#8 encrypted
format.</para><programlisting>openssl pkcs8 -topk8 -in yourprivate.key -out yourprivate.pkcs8.encrypted.key</programlisting></listitem>
             <listitem><para>Convert your PKCS#8 encrypted private key into the
PKCS#8 format that is compliant with &PRODUCT;</para><programlisting>openssl
pkcs8 -in yourprivate.pkcs8.encrypted.key -out yourprivate.pkcs8.key</programlisting></listitem>
         </orderedlist>          
         </listitem>

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d8103afd/docs/en-US/citrix-xenserver-installation.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/citrix-xenserver-installation.xml b/docs/en-US/citrix-xenserver-installation.xml
index 4053865..2cd39a4 100644
--- a/docs/en-US/citrix-xenserver-installation.xml
+++ b/docs/en-US/citrix-xenserver-installation.xml
@@ -62,7 +62,7 @@
           support any system that is not up to date with patches.</para>
       </listitem>
       <listitem>
-        <para>All hosts within a cluster must be homogenous. The CPUs must be of the
same type,
+        <para>All hosts within a cluster must be homogeneous. The CPUs must be of the
same type,
           count, and feature flags.</para>
       </listitem>
       <listitem>

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d8103afd/docs/en-US/configure-package-repository.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/configure-package-repository.xml b/docs/en-US/configure-package-repository.xml
index 3d102c6..c8ba48f 100644
--- a/docs/en-US/configure-package-repository.xml
+++ b/docs/en-US/configure-package-repository.xml
@@ -33,7 +33,7 @@
         If you didn't follow the steps to build your own packages from source 
         in the sections for <xref linkend="sect-source-buildrpm" /> or
         <xref linkend="sect-source-builddebs" /> you may find pre-built
-        DEB and RPM packages for your convience linked from the 
+        DEB and RPM packages for your convenience linked from the
         <ulink url="http://cloudstack.apache.org/downloads.html">downloads</ulink>
         page.
     </para>

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d8103afd/docs/en-US/configure-vpn.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/configure-vpn.xml b/docs/en-US/configure-vpn.xml
index 87b4e65..5d25620 100644
--- a/docs/en-US/configure-vpn.xml
+++ b/docs/en-US/configure-vpn.xml
@@ -29,7 +29,7 @@
 		<listitem><para>In the left navigation, click Global Settings.</para></listitem>
 		<listitem><para>Set the following global configuration parameters.</para>
 		<itemizedlist>
-			<listitem><para>remote.access.vpn.client.ip.range – The range of IP addressess
to be allocated to remote access VPN clients. The first IP in the range is used by the VPN
server.</para></listitem>
+			<listitem><para>remote.access.vpn.client.ip.range – The range of IP addresses
to be allocated to remote access VPN clients. The first IP in the range is used by the VPN
server.</para></listitem>
 			<listitem><para>remote.access.vpn.psk.length – Length of the IPSec key.</para></listitem>
 			<listitem><para>remote.access.vpn.user.limit – Maximum number of VPN users
per account.</para></listitem>
 		</itemizedlist></listitem></orderedlist>

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d8103afd/docs/en-US/console-proxy.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/console-proxy.xml b/docs/en-US/console-proxy.xml
index 64183b4..5f9a820 100644
--- a/docs/en-US/console-proxy.xml
+++ b/docs/en-US/console-proxy.xml
@@ -95,7 +95,7 @@
           </listitem>
           <listitem>
             <para>Convert your private key format into PKCS#8 encrypted format.</para>
-            <programlisting>openssl pkcs8 -topk8 -in yourprivate.key -out yourprivate.pkcs8.encryped.key</programlisting>
+            <programlisting>openssl pkcs8 -topk8 -in yourprivate.key -out yourprivate.pkcs8.encrypted.key</programlisting>
           </listitem>
           <listitem>
             <para>Convert your PKCS#8 encrypted private key into the PKCS#8 format
that is compliant

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d8103afd/docs/en-US/hypervisor-host-install-libvirt.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/hypervisor-host-install-libvirt.xml b/docs/en-US/hypervisor-host-install-libvirt.xml
index d7dc47f..f3ff090 100644
--- a/docs/en-US/hypervisor-host-install-libvirt.xml
+++ b/docs/en-US/hypervisor-host-install-libvirt.xml
@@ -28,7 +28,7 @@
     <orderedlist>
         <listitem>
             <para>In order to have live migration working libvirt has to listen for
unsecured TCP connections. We also need to turn off libvirts attempt to use Multicast DNS
advertising. Both of these settings are in <filename>/etc/libvirt/libvirtd.conf</filename></para>
-            <para>Set the following paramaters:</para>
+            <para>Set the following parameters:</para>
             <programlisting>listen_tls = 0</programlisting>
             <programlisting>listen_tcp = 1</programlisting>
             <programlisting>tcp_port = "16509"</programlisting>

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d8103afd/docs/en-US/hypervisor-host-install-network-openvswitch.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/hypervisor-host-install-network-openvswitch.xml b/docs/en-US/hypervisor-host-install-network-openvswitch.xml
index e9bf47a..a16dc8e 100644
--- a/docs/en-US/hypervisor-host-install-network-openvswitch.xml
+++ b/docs/en-US/hypervisor-host-install-network-openvswitch.xml
@@ -69,7 +69,7 @@
                 we can proceed to configuring the network.</para>
             <para>First we configure eth0</para>
             <programlisting language="Bash">vi /etc/sysconfig/network-scripts/ifcfg-eth0</programlisting>
-            <para>Make sure it looks similair to:</para>
+            <para>Make sure it looks similar to:</para>
             <programlisting><![CDATA[DEVICE=eth0
 HWADDR=00:04:xx:xx:xx:xx
 ONBOOT=yes

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d8103afd/docs/en-US/hypervisor-host-install-network.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/hypervisor-host-install-network.xml b/docs/en-US/hypervisor-host-install-network.xml
index 54cdc27..80156d9 100644
--- a/docs/en-US/hypervisor-host-install-network.xml
+++ b/docs/en-US/hypervisor-host-install-network.xml
@@ -50,7 +50,7 @@
             <para>The required packages were installed when libvirt was installed,
we can proceed to configuring the network.</para>
             <para>First we configure eth0</para>
             <programlisting language="Bash">vi /etc/sysconfig/network-scripts/ifcfg-eth0</programlisting>
-            <para>Make sure it looks similair to:</para>
+            <para>Make sure it looks similar to:</para>
             <programlisting><![CDATA[DEVICE=eth0
 HWADDR=00:04:xx:xx:xx:xx
 ONBOOT=yes
@@ -89,7 +89,7 @@ VLAN=yes
 BRIDGE=cloudbr1]]></programlisting>
             <para>Now we have the VLAN interfaces configured we can add the bridges
on top of them.</para>
             <programlisting language="Bash">vi /etc/sysconfig/network-scripts/ifcfg-cloudbr0</programlisting>
-            <para>Now we just configure it is a plain bridge without an IP-Adress</para>
+            <para>Now we just configure it is a plain bridge without an IP-Address</para>
             <programlisting><![CDATA[DEVICE=cloudbr0
 TYPE=Bridge
 ONBOOT=yes

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d8103afd/docs/en-US/management-server-install-prepare-os.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/management-server-install-prepare-os.xml b/docs/en-US/management-server-install-prepare-os.xml
index ef78731..02453a0 100644
--- a/docs/en-US/management-server-install-prepare-os.xml
+++ b/docs/en-US/management-server-install-prepare-os.xml
@@ -30,7 +30,7 @@
         <listitem>
             <para>Check for a fully qualified hostname.</para>
             <programlisting language="Bash">hostname --fqdn</programlisting>
-            <para>This should return a fully qualified hostname such as "managament1.lab.example.org".
 If it does not, edit /etc/hosts so that it does.</para>
+            <para>This should return a fully qualified hostname such as "management1.lab.example.org".
 If it does not, edit /etc/hosts so that it does.</para>
         </listitem>
         <listitem>
             <para>Make sure that the machine can reach the Internet.</para>

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d8103afd/docs/en-US/management-server-lb.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/management-server-lb.xml b/docs/en-US/management-server-lb.xml
index 9aee154..13f8756 100644
--- a/docs/en-US/management-server-lb.xml
+++ b/docs/en-US/management-server-lb.xml
@@ -58,7 +58,7 @@
       </tbody>
     </tgroup>
   </informaltable>
-  <para>In addition to above settings, the adminstrator is responsible for setting
the 'host' global
+  <para>In addition to above settings, the administrator is responsible for setting
the 'host' global
     config value from the management server IP to load balancer virtual IP address.
     If the 'host' value is not set to the VIP for Port 8250 and one of your management servers
crashes,
     the UI is still available but the system VMs will not be able to contact the management
server.

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d8103afd/docs/en-US/minimum-system-requirements.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/minimum-system-requirements.xml b/docs/en-US/minimum-system-requirements.xml
index de1bc22..870ef68 100644
--- a/docs/en-US/minimum-system-requirements.xml
+++ b/docs/en-US/minimum-system-requirements.xml
@@ -57,7 +57,7 @@
             <listitem><note><para>If DHCP is used for hosts, ensure that
no conflict occurs between DHCP server used for these hosts and the DHCP router created by
&PRODUCT;.</para></note></listitem>
 			<listitem><para>Latest hotfixes applied to hypervisor software</para></listitem>
 			<listitem><para>When you deploy &PRODUCT;, the hypervisor host must not
have any VMs already running</para></listitem>
-            <listitem><para>All hosts within a cluster must be homogenous. The
CPUs must be of the same type, count, and feature flags.</para></listitem>
+            <listitem><para>All hosts within a cluster must be homogeneous. The
CPUs must be of the same type, count, and feature flags.</para></listitem>
 		</itemizedlist>
 		<para>Hosts have additional requirements depending on the hypervisor. See the requirements
listed at the top of the Installation section for your chosen hypervisor:</para>
         <warning>

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d8103afd/docs/en-US/translating-documentation.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/translating-documentation.xml b/docs/en-US/translating-documentation.xml
index afe2765..4d5e3d2 100644
--- a/docs/en-US/translating-documentation.xml
+++ b/docs/en-US/translating-documentation.xml
@@ -32,7 +32,7 @@
             <listitem><para>Using the Transifex client and pushing your translated
strings to the website.</para></listitem>
         </itemizedlist>
     </para>
-    <para>Once a translation is complete, a site admin will pull the translated strings
within the &PRODUCT; repository, build the documenation and publish it.</para>
+    <para>Once a translation is complete, a site admin will pull the translated strings
within the &PRODUCT; repository, build the documentation and publish it.</para>
     <para>For instructions on how to use the Transifex website see <ulink url="http://sebgoa.blogspot.ch/2012/11/translating-apache-cloudstack-docs-with.html">http://sebgoa.blogspot.ch/2012/11/translating-apache-cloudstack-docs-with.html</ulink></para>
     <para>For instructions on how to use the Transifex client to translate from the
command line see <ulink url="http://sebgoa.blogspot.ch/2012/12/using-transifex-client-to-translate.html">http://sebgoa.blogspot.ch/2012/12/using-transifex-client-to-translate.html</ulink></para>
 </section>

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d8103afd/docs/en-US/using-sshkeys.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/using-sshkeys.xml b/docs/en-US/using-sshkeys.xml
index cd10d68..f34dfa0 100644
--- a/docs/en-US/using-sshkeys.xml
+++ b/docs/en-US/using-sshkeys.xml
@@ -92,7 +92,7 @@ KfEEuzcCUIxtJYTahJ1pvlFkQ8anpuxjSEDp8x/18bq3
         <para>After you save the SSH keypair file, you must create an instance by using
the template that you created at <xref linkend="create-ssh-template"/>. Ensure that
you use the same SSH key name that you created at <xref linkend="create-ssh-keypair"/>.</para>
         <note><para>You cannot create the instance by using the GUI at this time
and associate the instance with the newly created SSH keypair.</para></note>
         <para>A sample curl command to create a new instance is:</para>
-        <programlisting>curl --globoff http://localhost:&lt;port numbet&gt;/?command=deployVirtualMachine\&amp;zoneId=1\&amp;serviceOfferingId=18727021-7556-4110-9322-d625b52e0813\&amp;templateId=e899c18a-ce13-4bbf-98a9-625c5026e0b5\&amp;securitygroupids=ff03f02f-9e3b-48f8-834d-91b822da40c5\&amp;account=admin\&amp;domainid=1\&amp;keypair=keypair-doc</programlisting>
+        <programlisting>curl --globoff http://localhost:&lt;port number&gt;/?command=deployVirtualMachine\&amp;zoneId=1\&amp;serviceOfferingId=18727021-7556-4110-9322-d625b52e0813\&amp;templateId=e899c18a-ce13-4bbf-98a9-625c5026e0b5\&amp;securitygroupids=ff03f02f-9e3b-48f8-834d-91b822da40c5\&amp;account=admin\&amp;domainid=1\&amp;keypair=keypair-doc</programlisting>
         <para>Substitute the template, service offering and security group IDs (if
you are using the security group feature) that are in your cloud environment.</para>
         </section>
         <section id="logging-in-ssh">

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d8103afd/docs/en-US/vmware-requirements.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/vmware-requirements.xml b/docs/en-US/vmware-requirements.xml
index 207a456..d7a6d70 100644
--- a/docs/en-US/vmware-requirements.xml
+++ b/docs/en-US/vmware-requirements.xml
@@ -68,7 +68,7 @@
         <listitem><para>vCenter must be configured to use the standard port 443
so that it can communicate with the &PRODUCT; Management Server.</para></listitem>
         <listitem><para>You must re-install VMware ESXi if you are going to re-use
a host from a previous install.</para></listitem>
         <listitem><para>&PRODUCT; requires VMware vSphere 4.1 or 5.0.  VMware
vSphere 4.0 is not supported.</para></listitem>
-        <listitem><para>All hosts must be 64-bit and must support HVM (Intel-VT
or AMD-V enabled). All hosts within a cluster must be homogenous. That means the CPUs must
be of the same type, count, and feature flags.</para></listitem>
+        <listitem><para>All hosts must be 64-bit and must support HVM (Intel-VT
or AMD-V enabled). All hosts within a cluster must be homogeneous. That means the CPUs must
be of the same type, count, and feature flags.</para></listitem>
         <listitem><para>The &PRODUCT; management network must not be configured
as a separate virtual network. The &PRODUCT; management network is the same as the vCenter
management network, and will inherit its configuration. See <xref linkend="vmware-physical-host-networking-config-vcenter-mgt"
/>.</para></listitem>
         <listitem><para>&PRODUCT; requires ESXi.  ESX is not supported.</para></listitem>
         <listitem><para>All resources used for &PRODUCT; must be used for
&PRODUCT; only.  &PRODUCT; cannot share instance of ESXi or storage with other management
consoles.  Do not share the same storage volumes that will be used by &PRODUCT; with a
different set of ESXi servers that are not managed by &PRODUCT;.</para></listitem>

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d8103afd/docs/en-US/writing-new-documentation.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/writing-new-documentation.xml b/docs/en-US/writing-new-documentation.xml
index 340900e..7557359 100644
--- a/docs/en-US/writing-new-documentation.xml
+++ b/docs/en-US/writing-new-documentation.xml
@@ -82,7 +82,7 @@
         <section id="building-documentation">
             <title>Building &PRODUCT; Documentation</title>
             <para>To build a specific guide, go to the source tree of the documentation
in /docs and identify the guide you want to build.</para>
-            <para>Currenlty there are four guides plus the release notes, all defined
in publican configuration files:</para>
+            <para>Currently there are four guides plus the release notes, all defined
in publican configuration files:</para>
             <programlisting>
                publican-adminguide.cfg
                publican-devguide.cfg
@@ -96,5 +96,5 @@
         </section>
     ]]>
     </programlisting>
-    <para>Happy Publicaning and DocBooking.</para>
+    <para>Happy Publicating and DocBooking.</para>
 </section>


Mime
View raw message