From a4641280a7d687b4eae13b14d622874dd05a99fe Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Tue, 17 May 2016 08:28:33 +0100 Subject: [PATCH] Fix various spelling mistakes Mostly detected by Debian's Lintian tool. Signed-off-by: Simon McVittie --- builder/builder-cache.c | 2 +- builder/builder-utils.c | 2 +- common/flatpak-run.c | 2 +- doc/flatpak-build-finish.xml | 2 +- doc/flatpak-build-sign.xml | 4 ++-- doc/flatpak-build.xml | 4 ++-- doc/flatpak-builder.xml | 2 +- doc/flatpak-install.xml | 2 +- doc/flatpak-override.xml | 2 +- doc/flatpak-run.xml | 2 +- document-portal/xdp-main.c | 4 ++-- system-helper/flatpak-system-helper.c | 4 ++-- 12 files changed, 16 insertions(+), 16 deletions(-) diff --git a/builder/builder-cache.c b/builder/builder-cache.c index a4013773..d32a6af2 100644 --- a/builder/builder-cache.c +++ b/builder/builder-cache.c @@ -403,7 +403,7 @@ builder_cache_commit (BuilderCache *self, gboolean res = FALSE; g_autofree char *ref = NULL; - g_print ("Commiting stage %s to cache\n", self->stage); + g_print ("Committing stage %s to cache\n", self->stage); if (!ostree_repo_prepare_transaction (self->repo, NULL, NULL, error)) return FALSE; diff --git a/builder/builder-utils.c b/builder/builder-utils.c index b82a127b..99d27d3a 100644 --- a/builder/builder-utils.c +++ b/builder/builder-utils.c @@ -978,7 +978,7 @@ handle_dwarf2_section (DebuginfoData *data, GHashTable *files, GError **error) } else { - return flatpak_fail (0, 0, "%s: Wrong ELF data enconding", data->filename); + return flatpak_fail (0, 0, "%s: Wrong ELF data encoding", data->filename); } debug_sections = data->debug_sections; diff --git a/common/flatpak-run.c b/common/flatpak-run.c index aa5fb1f4..34650a45 100644 --- a/common/flatpak-run.c +++ b/common/flatpak-run.c @@ -1716,7 +1716,7 @@ flatpak_run_add_environment_args (GPtrArray *argv_array, if (!home_access) { - /* Enable persistant mapping only if no access to real home dir */ + /* Enable persistent mapping only if no access to real home dir */ g_hash_table_iter_init (&iter, context->persistent); while (g_hash_table_iter_next (&iter, &key, NULL)) diff --git a/doc/flatpak-build-finish.xml b/doc/flatpak-build-finish.xml index 7581c477..73bf20f0 100644 --- a/doc/flatpak-build-finish.xml +++ b/doc/flatpak-build-finish.xml @@ -228,7 +228,7 @@ If the application doesn't have access to the real homedir, make the (homedir-relative) path FILENAME a bind mount to the corresponding path in the per-application directory, - allowing that location to be used for persistant data. + allowing that location to be used for persistent data. This updates the [Context] group in the metadata. This option can be used multiple times. diff --git a/doc/flatpak-build-sign.xml b/doc/flatpak-build-sign.xml index ad8da8f7..068aa24d 100644 --- a/doc/flatpak-build-sign.xml +++ b/doc/flatpak-build-sign.xml @@ -42,7 +42,7 @@ Description - Signs the commit for a speficied application or runtime in + Signs the commit for a specified application or runtime in a local repository. LOCATION is the location of the repository. ID is the name of the application, or @@ -52,7 +52,7 @@ Applications can also be signed during build-export, but - it is sometimes useful to add additionaly signatures later. + it is sometimes useful to add additional signatures later. diff --git a/doc/flatpak-build.xml b/doc/flatpak-build.xml index e6abfce3..af16ddd9 100644 --- a/doc/flatpak-build.xml +++ b/doc/flatpak-build.xml @@ -45,7 +45,7 @@ must have been initialized with flatpak build-init. - The sdk that is specfied in the metadata file + The sdk that is specified in the metadata file in the directory is mounted at /usr and the files and var subdirectories are mounted at /app and /var, @@ -209,7 +209,7 @@ If the application doesn't have access to the real homedir, make the (homedir-relative) path FILENAME a bind mount to the corresponding path in the per-application directory, - allowing that location to be used for persistant data. + allowing that location to be used for persistent data. This overrides to the Context section from the application metadata. This option can be used multiple times. diff --git a/doc/flatpak-builder.xml b/doc/flatpak-builder.xml index 4572295c..eb2858ae 100644 --- a/doc/flatpak-builder.xml +++ b/doc/flatpak-builder.xml @@ -310,7 +310,7 @@ (boolean) - Ignore the existance of an autogen script + Ignore the existence of an autogen script (boolean) diff --git a/doc/flatpak-install.xml b/doc/flatpak-install.xml index bf8ae011..4a5fc309 100644 --- a/doc/flatpak-install.xml +++ b/doc/flatpak-install.xml @@ -58,7 +58,7 @@ the specified REMOTE, but you can limit this by using the --app or --runtime option. - Note that flatpak allows to have multiple branches of an application and runtimes + Note that flatpak allows one to have multiple branches of an application and runtimes installed and used at the same time. However, only version of an application one can be current, meaning its exported files (for instance desktop files and icons) are visible to the host. The last installed version is made current by diff --git a/doc/flatpak-override.xml b/doc/flatpak-override.xml index 50422c45..7cea5993 100644 --- a/doc/flatpak-override.xml +++ b/doc/flatpak-override.xml @@ -183,7 +183,7 @@ If the application doesn't have access to the real homedir, make the (homedir-relative) path FILENAME a bind mount to the corresponding path in the per-application directory, - allowing that location to be used for persistant data. + allowing that location to be used for persistent data. This overrides to the Context section from the application metadata. This option can be used multiple times. diff --git a/doc/flatpak-run.xml b/doc/flatpak-run.xml index 9f99c25a..3a26b0db 100644 --- a/doc/flatpak-run.xml +++ b/doc/flatpak-run.xml @@ -285,7 +285,7 @@ If the application doesn't have access to the real homedir, make the (homedir-relative) path FILENAME a bind mount to the corresponding path in the per-application directory, - allowing that location to be used for persistant data. + allowing that location to be used for persistent data. This overrides to the Context section from the application metadata. This option can be used multiple times. diff --git a/document-portal/xdp-main.c b/document-portal/xdp-main.c index 575ac907..75ed0423 100644 --- a/document-portal/xdp-main.c +++ b/document-portal/xdp-main.c @@ -385,7 +385,7 @@ portal_add (GDBusMethodInvocation *invocation, st_buf.st_dev != real_st_buf.st_dev || st_buf.st_ino != real_st_buf.st_ino) { - /* Don't leak any info about real file path existance, etc */ + /* Don't leak any info about real file path existence, etc */ g_dbus_method_invocation_return_error (invocation, FLATPAK_PORTAL_ERROR, FLATPAK_PORTAL_ERROR_INVALID_ARGUMENT, "Invalid fd passed"); @@ -488,7 +488,7 @@ portal_add_named (GDBusMethodInvocation *invocation, g_variant_get (parameters, "(h@aybb)", &parent_fd_id, &filename_v, &reuse_existing, &persistent); filename = g_variant_get_bytestring (filename_v); - /* This is only allowed from the host, or else we could leak existance of files */ + /* This is only allowed from the host, or else we could leak existence of files */ if (*app_id != 0) { g_dbus_method_invocation_return_error (invocation, FLATPAK_PORTAL_ERROR, FLATPAK_PORTAL_ERROR_NOT_ALLOWED, diff --git a/system-helper/flatpak-system-helper.c b/system-helper/flatpak-system-helper.c index 3d214d17..e31239e6 100644 --- a/system-helper/flatpak-system-helper.c +++ b/system-helper/flatpak-system-helper.c @@ -579,7 +579,7 @@ on_bus_acquired (GDBusConnection *connection, { GError *error = NULL; - g_debug ("Bus aquired, creating skeleton"); + g_debug ("Bus acquired, creating skeleton"); helper = flatpak_system_helper_skeleton_new (); @@ -612,7 +612,7 @@ on_name_acquired (GDBusConnection *connection, const gchar *name, gpointer user_data) { - g_debug ("Name aquired"); + g_debug ("Name acquired"); } static void