From: Richard Russon Date: Fri, 6 Oct 2017 21:19:01 +0000 (+0100) Subject: docs: fix case of Notmuch X-Git-Tag: neomutt-20171013~13 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2fce4b1d5bd517683fa21eadcff4d750112d514b;p=neomutt docs: fix case of Notmuch --- diff --git a/ChangeLog.md b/ChangeLog.md index 830afd13a..f0558188c 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -1018,7 +1018,7 @@ Marco Hinz (mhinz) * Docs - Fix DocBook validation - - Document NotMuch queries + - Document Notmuch queries * Build - More Autoconf improvements Darshit Shah (darnir) @@ -1147,7 +1147,7 @@ * Other Changes - Numerous small tweaks to the docs - Lots of minor code tidy-ups - - Enabling NotMuch now forcibly enables Sidebar + - Enabling Notmuch now forcibly enables Sidebar (it is dependent on it, for now) - A couple of bug fixes from mutt/stable diff --git a/doc/manual.xml.head b/doc/manual.xml.head index 06832de05..0297ed29b 100644 --- a/doc/manual.xml.head +++ b/doc/manual.xml.head @@ -12485,7 +12485,7 @@ bind index \CG get-message - Using NotMuch + Using Notmuch Folders URI @@ -12544,7 +12544,7 @@ virtual-mailboxes "My INBOX" "notmuch://?query=tag:inbox" - Format String for the NotMuch Browser + Format String for the Notmuch Browser Default: %2C %?n?%4n/& ?%4m %f diff --git a/mutt_notmuch.c b/mutt_notmuch.c index f1cf5bd91..efcaca104 100644 --- a/mutt_notmuch.c +++ b/mutt_notmuch.c @@ -1,6 +1,6 @@ /** * @file - * NotMuch virtual mailbox type + * Notmuch virtual mailbox type * * @authors * Copyright (C) 2011-2016 Karel Zak @@ -75,7 +75,7 @@ LIBNOTMUCH_MICRO_VERSION >= (_micro))) /** - * enum NmQueryType - NotMuch Query Types + * enum NmQueryType - Notmuch Query Types * * Read whole-thread or matching messages only? */ @@ -86,7 +86,7 @@ enum NmQueryType }; /** - * struct UriTag - Parsed NotMuch-URI arguments + * struct UriTag - Parsed Notmuch-URI arguments * * The arguments in a URI are saved in a linked list. * @@ -100,9 +100,9 @@ struct UriTag }; /* - * struct NmHdrData - NotMuch data attached to an email + * struct NmHdrData - Notmuch data attached to an email * - * This stores all the NotMuch data associated with an email. + * This stores all the Notmuch data associated with an email. * * @sa Header#data, MUTT_MBOX */ @@ -110,14 +110,14 @@ struct NmHdrData { char *folder; /**< Location of the email */ char *oldpath; - char *virtual_id; /**< Unique NotMuch Id */ + char *virtual_id; /**< Unique Notmuch Id */ int magic; /**< Type of mailbox the email is in */ }; /** - * struct NmCtxData - NotMuch data attached to a context + * struct NmCtxData - Notmuch data attached to a context * - * This stores the global NotMuch data, such as the database connection. + * This stores the global Notmuch data, such as the database connection. * * @sa Context#data, NmDbLimit, NM_QUERY_TYPE_MESGS */ @@ -125,7 +125,7 @@ struct NmCtxData { notmuch_database_t *db; - char *db_filename; /**< Filename of the NotMuch database */ + char *db_filename; /**< Filename of the Notmuch database */ char *db_query; /**< Previous query */ int db_limit; /**< Maximum number of results to return */ enum NmQueryType query_type; /**< Messages or Threads */ @@ -145,9 +145,9 @@ struct NmCtxData #if 0 /** * debug_print_filenames - Show a message's filenames - * @param msg NotMuch Message + * @param msg Notmuch Message * - * Print a list of all the filenames associated with a NotMuch message. + * Print a list of all the filenames associated with a Notmuch message. */ static void debug_print_filenames(notmuch_message_t *msg) { @@ -164,9 +164,9 @@ static void debug_print_filenames(notmuch_message_t *msg) /** * debug_print_tags - Show a message's tags - * @param msg NotMuch Message + * @param msg Notmuch Message * - * Print a list of all the tags associated with a NotMuch message. + * Print a list of all the tags associated with a Notmuch message. */ static void debug_print_tags(notmuch_message_t *msg) { @@ -209,7 +209,7 @@ static void url_free_tags(struct UriTag *tags) * @retval true Success * @retval false Error Bad format * - * Parse a NotMuch URI, such as: + * Parse a Notmuch URI, such as: * * notmuch:///path/to/db?query=tag:lkml&limit=1000 * * notmuch://?query=neomutt * @@ -301,7 +301,7 @@ static void free_hdrdata(struct NmHdrData *data) * free_ctxdata - Free data attached to the context * @param data A mailbox CONTEXT * - * The nm_ctxdata struct stores global NotMuch data, such as the connection to + * The nm_ctxdata struct stores global Notmuch data, such as the connection to * the database. This function will close the database, free the resources and * the struct itself. */ @@ -328,7 +328,7 @@ static void free_ctxdata(struct NmCtxData *data) /** * new_ctxdata - Create a new nm_ctxdata object from a query - * @param uri NotMuch query string + * @param uri Notmuch query string * @retval ptr New nm_ctxdata struct * * A new nm_ctxdata struct is created, then the query is parsed and saved @@ -357,13 +357,13 @@ static struct NmCtxData *new_ctxdata(char *uri) } /** - * init_context - Add NotMuch data to the Context + * init_context - Add Notmuch data to the Context * @param ctx A mailbox CONTEXT * @retval 0 Success * @retval -1 Error Bad format * * Create a new nm_ctxdata struct and add it CONTEXT::data. - * NotMuch-specific data will be stored in this struct. + * Notmuch-specific data will be stored in this struct. * This struct can be freed using free_hdrdata(). */ static int init_context(struct Context *ctx) @@ -694,7 +694,7 @@ static int release_db(struct NmCtxData *data) } /** - * db_trans_begin - Start a NotMuch database transaction + * db_trans_begin - Start a Notmuch database transaction * @param data Header data * @retval <0 error * @retval 1 new transaction started @@ -734,7 +734,7 @@ static int db_trans_end(struct NmCtxData *data) } /** - * is_longrun - Is NotMuch in the middle of a long-running transaction + * is_longrun - Is Notmuch in the middle of a long-running transaction * @param data Header data * @retval true if it is */ @@ -942,7 +942,7 @@ static void deinit_header(struct Header *h) /** * nm2mutt_message_id - converts notmuch message Id to neomutt message Id - * @param id NotMuch ID to convert + * @param id Notmuch ID to convert * @retval string NeoMutt message ID * * Caller must free the NeoMutt Message ID diff --git a/mutt_notmuch.h b/mutt_notmuch.h index d8d0e758d..bbbe8d432 100644 --- a/mutt_notmuch.h +++ b/mutt_notmuch.h @@ -1,6 +1,6 @@ /** * @file - * NotMuch virtual mailbox type + * Notmuch virtual mailbox type * * @authors * Copyright (C) 2011 Karel Zak diff --git a/mutt_options.h b/mutt_options.h index 229e9b6d0..d8dfd350e 100644 --- a/mutt_options.h +++ b/mutt_options.h @@ -1,6 +1,6 @@ /** * @file - * NotMuch virtual mailbox type + * Notmuch virtual mailbox type * * @authors * Copyright (C) 2016 Bernard Pratz diff --git a/po/de.po b/po/de.po index ad3795fe9..2935bdbf6 100644 --- a/po/de.po +++ b/po/de.po @@ -1391,7 +1391,7 @@ msgstr "Fragefenster sind ausgeschaltet." #: curs_main.c:1980 curs_main.c:1999 msgid "No notmuch vfolder currently loaded." -msgstr "Zur Zeit ist kein virtueller NotMuch-Ordner geladen." +msgstr "Zur Zeit ist kein virtueller Notmuch-Ordner geladen." #: curs_main.c:2037 msgid "Open mailbox in read-only mode"