Merge branch 'stable-2.10' into stable-2.11

* stable-2.10
  Update tag limitations
  Fix typos in doc/design-storagetypes.rst
Signed-off-by: Klaus Aehlig <aehlig@google.com>
Reviewed-by: Petr Pudlak <pudlak@google.com>

doc/admin.rst

@@ -1555,7 +1555,7 @@ Limitations
 Note that the set of characters present in a tag and the maximum tag
 length are restricted. Currently the maximum length is 128 characters,
 there can be at most 4096 tags per object, and the set of characters is
-comprised by alphanumeric characters and additionally ``.+*/:@-``.
+comprised by alphanumeric characters and additionally ``.+*/:@-_``.
 
 Operations
 ++++++++++

doc/design-storagetypes.rst

@@ -9,7 +9,7 @@ Background
 
 Currently, there is no consistent management of different variants of storage
 in Ganeti. One direct consequence is that storage space reporting is currently
-broken for all storage that is not based on lvm technolgy. This design looks at
+broken for all storage that is not based on lvm technology. This design looks at
 the root causes and proposes a way to fix it.
 
 Proposed changes
@@ -233,7 +233,7 @@ displayed in ``gnt-node list-storage``. This will also adapt to the
 extended storage reporting capabilities. The user can specify a storage
 type using ``--storage-type``. If he requests storage information about
 a storage type which does not support space reporting, a warning is
-emitted. If no storage type is specified explicitely, ``gnt-node
+emitted. If no storage type is specified explicitly, ``gnt-node
 list-storage`` will try to report storage on the storage type of the
 default disk template. If the default disk template's storage type does
 not support space reporting, an error message is emitted.