| Index: native_client_sdk/src/build_tools/manifest_util.py
|
| diff --git a/native_client_sdk/src/build_tools/manifest_util.py b/native_client_sdk/src/build_tools/manifest_util.py
|
| index fad583a3a5122ce4ada54010f31a762b2903260a..51cf24ccd77c19fafbb3d4a6c5aa0d13e0ea6b3d 100644
|
| --- a/native_client_sdk/src/build_tools/manifest_util.py
|
| +++ b/native_client_sdk/src/build_tools/manifest_util.py
|
| @@ -156,7 +156,7 @@ class Archive(dict):
|
| """Update the size and checksum information for this archive
|
| based on the content currently at the URL.
|
|
|
| - This allows the template mandifest to be maintained without
|
| + This allows the template manifest to be maintained without
|
| the need to size and checksums to be present.
|
| """
|
| template = string.Template(self['url'])
|
| @@ -528,7 +528,7 @@ class SDKManifest(object):
|
| local_bundle.MergeWithBundle(bundle)
|
|
|
| def MergeManifest(self, manifest):
|
| - '''Merge another manifest into this manifest, disallowing overiding.
|
| + '''Merge another manifest into this manifest, disallowing overriding.
|
|
|
| Args
|
| manifest: The manifest to merge.
|
|
|