{"thread":{"id":"46334","subject":"[PATCH 0/4] Misc. documentation fixes","startedAt":"2017-07-08T20:39:55Z","lastAt":"2017-07-10T16:18:03Z","messageCount":10,"participants":["astian","Junio C Hamano","Jeff King"],"isPatch":true,"patchVersion":1,"patchTotal":4},"messages":[{"id":"324002","messageId":"20170708203413.16442-1-astian@eclipso.at","threadId":"46334","inReplyTo":null,"subject":"[PATCH 0/4] Misc. documentation fixes","fromName":"astian","fromEmail":"astian@eclipso.at","sentAt":"2017-07-08T20:34:09Z","receivedAt":"2017-07-08T20:39:55Z","isPatch":true,"sender":{"key":"astian@eclipso.at","avatar":null},"body":"Hi there,\n\nI was looking into adding a new option to git-send-email (and I may\nlater send the patches implementing that) but as I looked over the code\nand associated documentation I found a few places where I thought\nimprovement could be made.  So here are some documentation fixes and\nclarifications that you might find useful.\n\nThey apply cleanly on top of commit 8b2efe2a0 (Fifteenth batch for 2.14).\n\nNote 1: even though I'm sending them as a \"series\", all of these are in\nfact independent of each other.\n\nNote 2: see below for a couple of patch-specific comments.\n\nastian (4):\n  Doc/config.txt: explain repeated sections\n  Doc/config.txt: fix typos\n  Doc/git-send-email.txt: clarify a couple of options\n\n    Still to fix:\n      --smtp-encryption:\n        The current nomenclarure is braindamaged: what's currently\n        called \"ssl\" should be called \"tls\", what's currently called\n        \"tls\" should be called \"starttls\".\n\n      --smtp-server-option:\n        IMO the option is wrongly named: this option only works with a\n        local sendmail-like binary.  When talking to that program, SMTP\n        is not used.\n\n  Doc/config.txt: fix documentation for smtpEncryption\n\n    I don't know what's the story behind this, but IMO having\n    \"smtpEncryption\" configurable from \"sendemail.<identity>\"\n    subsections is useful and should be preserved.\n\n    For example, one can set \"ssl\" (meaning TLS) as global configuration\n    (under \"sendemail\"), but set it to \"none\" (that is, plain text) for\n    a particular identity that actually connects to an i2p or onion\n    server, i.e. through an already encrypted transport.\n\n Documentation/config.txt         |  5 +----\n Documentation/git-send-email.txt | 15 +++++++++------\n 2 files changed, 10 insertions(+), 10 deletions(-)\n\n-- \n2.13.2\n\n\n\n"},{"id":"324003","messageId":"20170708203413.16442-2-astian@eclipso.at","threadId":"46334","inReplyTo":"20170708203413.16442-1-astian@eclipso.at","subject":"[PATCH 1/4] Doc/config.txt: explain repeated sections","fromName":"astian","fromEmail":"astian@eclipso.at","sentAt":"2017-07-08T20:34:10Z","receivedAt":"2017-07-08T20:40:07Z","isPatch":true,"sender":{"key":"astian@eclipso.at","avatar":null},"body":"Add a paragraph explaining what happens when a section name is repeated\nin the configuration file(s).\n\nThe example configuration file shown in this document already implied\nGit's behaviour, this patch simply tries to make it explicit.\n\nSigned-off-by: astian <astian@eclipso.at>\n---\n Documentation/config.txt | 4 ++++\n 1 file changed, 4 insertions(+)\n\ndiff --git a/Documentation/config.txt b/Documentation/config.txt\nindex d5c9c4cab..afce25705 100644\n--- a/Documentation/config.txt\n+++ b/Documentation/config.txt\n@@ -31,6 +31,10 @@ characters, `-` and `.` are allowed in section names.  Each variable\n must belong to some section, which means that there must be a section\n header before the first setting of a variable.\n \n+Multiple occurrences of the same section are all logically merged.  (There's\n+no special treatment for variables defined multiple times across physically\n+different sections, the variable is simply made multivalued.)\n+\n Sections can be further divided into subsections.  To begin a subsection\n put its name in double quotes, separated by space from the section name,\n in the section header, like in the example below:\n-- \n2.13.2\n\n\n\n"},{"id":"324004","messageId":"20170708203413.16442-3-astian@eclipso.at","threadId":"46334","inReplyTo":"20170708203413.16442-1-astian@eclipso.at","subject":"[PATCH 2/4] Doc/config.txt: fix typos","fromName":"astian","fromEmail":"astian@eclipso.at","sentAt":"2017-07-08T20:34:11Z","receivedAt":"2017-07-08T20:40:23Z","isPatch":true,"sender":{"key":"astian@eclipso.at","avatar":null},"body":"Signed-off-by: astian <astian@eclipso.at>\n---\n Documentation/config.txt | 4 ++--\n 1 file changed, 2 insertions(+), 2 deletions(-)\n\ndiff --git a/Documentation/config.txt b/Documentation/config.txt\nindex d5c9c4cab..72e85b002 100644\n--- a/Documentation/config.txt\n+++ b/Documentation/config.txt\n@@ -60,7 +60,7 @@ The variable names are case-insensitive, allow only alphanumeric characters\n and `-`, and must start with an alphabetic character.\n \n A line that defines a value can be continued to the next line by\n-ending it with a `\\`; the backquote and the end-of-line are\n+ending it with a `\\`; the backslash and the end-of-line are\n stripped.  Leading whitespaces after 'name =', the remainder of the\n line after the first comment character '#' or ';', and trailing\n whitespaces of the line are discarded unless they are enclosed in\n@@ -2912,7 +2912,7 @@ sendemail.smtpsslcertpath::\n \n sendemail.<identity>.*::\n \tIdentity-specific versions of the 'sendemail.*' parameters\n-\tfound below, taking precedence over those when the this\n+\tfound below, taking precedence over those when this\n \tidentity is selected, through command-line or\n \t`sendemail.identity`.\n \n-- \n2.13.2\n\n\n\n"},{"id":"324005","messageId":"20170708203413.16442-4-astian@eclipso.at","threadId":"46334","inReplyTo":"20170708203413.16442-1-astian@eclipso.at","subject":"[PATCH 3/4] Doc/git-send-email.txt: clarify a couple of options","fromName":"astian","fromEmail":"astian@eclipso.at","sentAt":"2017-07-08T20:34:12Z","receivedAt":"2017-07-08T20:40:24Z","isPatch":true,"sender":{"key":"astian@eclipso.at","avatar":null},"body":"Clarify the meaning of --smtp-encryption and --smtp-server-option.\n\nSigned-off-by: astian <astian@eclipso.at>\n---\n Documentation/git-send-email.txt | 15 +++++++++------\n 1 file changed, 9 insertions(+), 6 deletions(-)\n\ndiff --git a/Documentation/git-send-email.txt b/Documentation/git-send-email.txt\nindex bac9014ac..158b51045 100644\n--- a/Documentation/git-send-email.txt\n+++ b/Documentation/git-send-email.txt\n@@ -161,7 +161,8 @@ Sending\n \tunspecified, choosing the envelope sender is left to your MTA.\n \n --smtp-encryption=<encryption>::\n-\tSpecify the encryption to use, either 'ssl' or 'tls'.  Any other\n+\tSpecify the encryption to use, either 'ssl' (direct TLS) or\n+\t'tls' (plain text upgraded to TLS via STARTTLS).  Any other\n \tvalue reverts to plain SMTP.  Default is the value of\n \t`sendemail.smtpEncryption`.\n \n@@ -216,13 +217,15 @@ a password is obtained using 'git-credential'.\n \t`sendemail.smtpServerPort` configuration variable.\n \n --smtp-server-option=<option>::\n-\tIf set, specifies the outgoing SMTP server option to use.\n+\tSpecifies a command line option to pass to the local sendmail-like\n+\tbinary.  Only useful when `--smtp-server` (or `sendemail.smtpServer`)\n+\tpoints to a local absolute path corresponding to the program binary.\n \tDefault value can be specified by the `sendemail.smtpServerOption`\n-\tconfiguration option.\n+\tconfiguration variable.\n +\n-The --smtp-server-option option must be repeated for each option you want\n-to pass to the server. Likewise, different lines in the configuration files\n-must be used for each option.\n+This option must be used once for each command line argument you want to pass\n+to the program.  Correspondingly, the configuration variable is multivalued:\n+set it, in order, once per command line argument.\n \n --smtp-ssl::\n \tLegacy alias for '--smtp-encryption ssl'.\n-- \n2.13.2\n\n\n\n"},{"id":"324006","messageId":"20170708203413.16442-5-astian@eclipso.at","threadId":"46334","inReplyTo":"20170708203413.16442-1-astian@eclipso.at","subject":"[PATCH 4/4] Doc/config.txt: fix documentation for smtpEncryption","fromName":"astian","fromEmail":"astian@eclipso.at","sentAt":"2017-07-08T20:34:13Z","receivedAt":"2017-07-08T20:40:35Z","isPatch":true,"sender":{"key":"astian@eclipso.at","avatar":null},"body":"Stop saying that smtpEncryption (a configuration variable used by\ngit-send-email) is not usable in \"sendemail.<identity>\" subsections,\nbecause that's false.\n\nSigned-off-by: astian <astian@eclipso.at>\n---\n Documentation/config.txt | 5 +----\n 1 file changed, 1 insertion(+), 4 deletions(-)\n\ndiff --git a/Documentation/config.txt b/Documentation/config.txt\nindex d5c9c4cab..f40758c31 100644\n--- a/Documentation/config.txt\n+++ b/Documentation/config.txt\n@@ -2899,10 +2899,6 @@ sendemail.identity::\n \tvalues in the 'sendemail' section. The default identity is\n \tthe value of `sendemail.identity`.\n \n-sendemail.smtpEncryption::\n-\tSee linkgit:git-send-email[1] for description.  Note that this\n-\tsetting is not subject to the 'identity' mechanism.\n-\n sendemail.smtpssl (deprecated)::\n \tDeprecated alias for 'sendemail.smtpEncryption = ssl'.\n \n@@ -2933,6 +2929,7 @@ sendemail.suppresscc::\n sendemail.suppressFrom::\n sendemail.to::\n sendemail.smtpDomain::\n+sendemail.smtpEncryption::\n sendemail.smtpServer::\n sendemail.smtpServerPort::\n sendemail.smtpServerOption::\n-- \n2.13.2\n\n\n\n"},{"id":"324009","messageId":"xmqqfue6a5va.fsf@gitster.mtv.corp.google.com","threadId":"46334","inReplyTo":"20170708203413.16442-2-astian@eclipso.at","subject":"Re: [PATCH 1/4] Doc/config.txt: explain repeated sections","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2017-07-08T23:03:37Z","receivedAt":"2017-07-08T23:03:47Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"astian <astian@eclipso.at> writes:\n\n> Add a paragraph explaining what happens when a section name is repeated\n> in the configuration file(s).\n>\n> The example configuration file shown in this document already implied\n> Git's behaviour, this patch simply tries to make it explicit.\n>\n> Signed-off-by: astian <astian@eclipso.at>\n> ---\n>  Documentation/config.txt | 4 ++++\n>  1 file changed, 4 insertions(+)\n>\n> diff --git a/Documentation/config.txt b/Documentation/config.txt\n> index d5c9c4cab..afce25705 100644\n> --- a/Documentation/config.txt\n> +++ b/Documentation/config.txt\n> @@ -31,6 +31,10 @@ characters, `-` and `.` are allowed in section names.  Each variable\n>  must belong to some section, which means that there must be a section\n>  header before the first setting of a variable.\n>  \n> +Multiple occurrences of the same section are all logically merged.  (There's\n> +no special treatment for variables defined multiple times across physically\n> +different sections, the variable is simply made multivalued.)\n> +\n\nLooks correct; it's a bit surprising that we didn't already mention\nmultiple occurrences, but I do not find it so this is a good\naddition. \n\nI do not see a strong reason for () around the second sentence,\nthough.\n\nBy the way, with something that is supposed to hopefully have some\nlegal value down the line if somebody starts making noises, it\nreally would be nice to have a real person to associate things with.\nIt would be embarrassing later if there is no way to even look you\nup somehow.  Documentation/SubmittingPatches asks you to sign-off\nwith a real name for a reason.\n\nThanks.\n"},{"id":"324010","messageId":"xmqqbmoua5lk.fsf@gitster.mtv.corp.google.com","threadId":"46334","inReplyTo":"20170708203413.16442-5-astian@eclipso.at","subject":"Re: [PATCH 4/4] Doc/config.txt: fix documentation for smtpEncryption","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2017-07-08T23:09:27Z","receivedAt":"2017-07-08T23:09:38Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"astian <astian@eclipso.at> writes:\n\n> Stop saying that smtpEncryption (a configuration variable used by\n> git-send-email) is not usable in \"sendemail.<identity>\" subsections,\n> because that's false.\n\nHmph, does anybody know when this stopped being true, or was it\nincorrect from the very beginning?\n\n>\n> Signed-off-by: astian <astian@eclipso.at>\n> ---\n>  Documentation/config.txt | 5 +----\n>  1 file changed, 1 insertion(+), 4 deletions(-)\n>\n> diff --git a/Documentation/config.txt b/Documentation/config.txt\n> index d5c9c4cab..f40758c31 100644\n> --- a/Documentation/config.txt\n> +++ b/Documentation/config.txt\n> @@ -2899,10 +2899,6 @@ sendemail.identity::\n>  \tvalues in the 'sendemail' section. The default identity is\n>  \tthe value of `sendemail.identity`.\n>  \n> -sendemail.smtpEncryption::\n> -\tSee linkgit:git-send-email[1] for description.  Note that this\n> -\tsetting is not subject to the 'identity' mechanism.\n> -\n>  sendemail.smtpssl (deprecated)::\n>  \tDeprecated alias for 'sendemail.smtpEncryption = ssl'.\n>  \n> @@ -2933,6 +2929,7 @@ sendemail.suppresscc::\n>  sendemail.suppressFrom::\n>  sendemail.to::\n>  sendemail.smtpDomain::\n> +sendemail.smtpEncryption::\n>  sendemail.smtpServer::\n>  sendemail.smtpServerPort::\n>  sendemail.smtpServerOption::\n"},{"id":"324012","messageId":"xmqq7ezi9h64.fsf@gitster.mtv.corp.google.com","threadId":"46334","inReplyTo":"xmqqfue6a5va.fsf@gitster.mtv.corp.google.com","subject":"Re: [PATCH 1/4] Doc/config.txt: explain repeated sections","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2017-07-09T07:57:07Z","receivedAt":"2017-07-09T07:57:16Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Junio C Hamano <gitster@pobox.com> writes:\n\n>> +Multiple occurrences of the same section are all logically merged.  (There's\n>> +no special treatment for variables defined multiple times across physically\n>> +different sections, the variable is simply made multivalued.)\n>> +\n>\n> Looks correct; it's a bit surprising that we didn't already mention\n> multiple occurrences, but I do not find it so this is a good\n> addition. \n>\n> I do not see a strong reason for () around the second sentence,\n> though.\n\nAfter re-reading this, I am wondering if the \"made multivalued\"\nabove need to be made less confusing.  For a variable that is single\nvalued, the usual \"the last one wins\" rule is applied---it's not\nlike\n\n    [user] \n\tname = astian\n\tname = gitster\n\nmakes user.name \"gitster\" while\n\n    [user] \n\tname = astian\n    [user]\n\tname = gitster\n\nmakes user.name \"multivalued\".  In either case, the last one wins,\nand it comes not from the syntax but from the semantics assigned to\nthe variable in question.  What we want to say is not \"multi-valued\",\nbut the above two forms both mean the same thing.\n\nBut perhaps I am needlessly worried about possible confusion too\nmuch.  I dunno.\n\nThanks.\n"},{"id":"324052","messageId":"20170710073229.mwf7zufx3xmszkde@sigill.intra.peff.net","threadId":"46334","inReplyTo":"xmqq7ezi9h64.fsf@gitster.mtv.corp.google.com","subject":"Re: [PATCH 1/4] Doc/config.txt: explain repeated sections","fromName":"Jeff King","fromEmail":"peff@peff.net","sentAt":"2017-07-10T07:32:29Z","receivedAt":"2017-07-10T07:32:36Z","isPatch":true,"sender":{"key":"peff@peff.net","avatar":"https://avatars.githubusercontent.com/u/45925?v=4"},"body":"On Sun, Jul 09, 2017 at 12:57:07AM -0700, Junio C Hamano wrote:\n\n> Junio C Hamano <gitster@pobox.com> writes:\n> \n> >> +Multiple occurrences of the same section are all logically merged.  (There's\n> >> +no special treatment for variables defined multiple times across physically\n> >> +different sections, the variable is simply made multivalued.)\n> >> +\n> >\n> > Looks correct; it's a bit surprising that we didn't already mention\n> > multiple occurrences, but I do not find it so this is a good\n> > addition. \n> >\n> > I do not see a strong reason for () around the second sentence,\n> > though.\n> \n> After re-reading this, I am wondering if the \"made multivalued\"\n> above need to be made less confusing.  For a variable that is single\n> valued, the usual \"the last one wins\" rule is applied---it's not\n> like\n> \n>     [user] \n> \tname = astian\n> \tname = gitster\n> \n> makes user.name \"gitster\" while\n> \n>     [user] \n> \tname = astian\n>     [user]\n> \tname = gitster\n> \n> makes user.name \"multivalued\".  In either case, the last one wins,\n> and it comes not from the syntax but from the semantics assigned to\n> the variable in question.  What we want to say is not \"multi-valued\",\n> but the above two forms both mean the same thing.\n> \n> But perhaps I am needlessly worried about possible confusion too\n> much.  I dunno.\n\nFWIW, the use of \"multivalued\" here tickled my spider sense, too. I\nthink when talking on the list we generally reserve \"multivalued\" for\ntrue \"we expect this to be a list\" variables. But the only mention of\n\"multivalued\" in the config documentation seems to be:\n\n  Some variables may appear multiple times; we say then that the\n  variable is multivalued.\n\nI think the proposed use is consistent with that (and that line is only\n2 paragraphs above the proposed paragraph).\n\n-Peff\n"},{"id":"324080","messageId":"xmqqzicc6zbf.fsf@gitster.mtv.corp.google.com","threadId":"46334","inReplyTo":"20170710073229.mwf7zufx3xmszkde@sigill.intra.peff.net","subject":"Re: [PATCH 1/4] Doc/config.txt: explain repeated sections","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2017-07-10T16:17:56Z","receivedAt":"2017-07-10T16:18:03Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Jeff King <peff@peff.net> writes:\n\n> FWIW, the use of \"multivalued\" here tickled my spider sense, too. I\n> think when talking on the list we generally reserve \"multivalued\" for\n> true \"we expect this to be a list\" variables. But the only mention of\n> \"multivalued\" in the config documentation seems to be:\n>\n>   Some variables may appear multiple times; we say then that the\n>   variable is multivalued.\n>\n> I think the proposed use is consistent with that (and that line is only\n> 2 paragraphs above the proposed paragraph).\n\nThanks for careful reading.\n\n"}]}