From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Okamsn Newsgroups: gmane.emacs.devel Subject: Re: How to install documentation in sub-directory with Package VC? Date: Sun, 02 Apr 2023 00:41:43 +0000 Message-ID: References: <87bkkvconh.fsf@posteo.net> <87o7oujqqp.fsf@posteo.net> <98f76116-4f5a-c225-3123-78c612ec64cb@protonmail.com> <875yb1gk55.fsf@posteo.net> <87cz4te31m.fsf@posteo.net> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="b1_6CXPuzS7ex2Kr7YtTLp1sNp1106cm7HlRVeV5dWjAc" Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="19466"; mail-complaints-to="usenet@ciao.gmane.io" Cc: emacs-devel@gnu.org To: Philip Kaludercic , Eli Zaretskii Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Sun Apr 02 06:54:04 2023 Return-path: Envelope-to: ged-emacs-devel@m.gmane-mx.org Original-Received: from lists.gnu.org ([209.51.188.17]) by ciao.gmane.io with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1pipjA-0004qO-4L for ged-emacs-devel@m.gmane-mx.org; Sun, 02 Apr 2023 06:54:04 +0200 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pipia-00038K-KR; Sun, 02 Apr 2023 00:53:28 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pilnG-0006AZ-3z for emacs-devel@gnu.org; Sat, 01 Apr 2023 20:42:02 -0400 Original-Received: from mail-4322.protonmail.ch ([185.70.43.22]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pilnD-0007wr-IK; Sat, 01 Apr 2023 20:42:01 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail3; t=1680396115; x=1680655315; bh=4J5D0G8Msh3Beb38nE+BuG0+C+e1gVNwlwIAjQ1uS/U=; h=Date:To:From:Cc:Subject:Message-ID:In-Reply-To:References: Feedback-ID:From:To:Cc:Date:Subject:Reply-To:Feedback-ID: Message-ID:BIMI-Selector; b=yM161yFkrn6VYtXNtl6v+KwcTYUSkIxb1O31Ee/i2mYF7DzqwsNSauX4vSw/KiaMN Uho7w7p70I7MpQC9ycihE7A2gOY1X1xeEPX+cHII0OJ8ewiQbuW1bWgNJpQ2oZZAFl pg8K2dDGj3A1BHP1cHurbRMrmfp4+IcQzP/3kdusbe3RrcCCWnIjR+pewAJRc6UX+y xKZAPiJDKSEfIpYWsLNaMZbOUz1LeCkRhD2VewjwaQCpei1zYapzj0WB6ckZmMEqh4 XHEirEeJJ1fVUGlKyDfkF59FnKGDG8qgHe8B8SGGrY+zb6Zu/Xx8xhfDMMrupHxvGj tMgNOzxfasEdQ== In-Reply-To: <87cz4te31m.fsf@posteo.net> Feedback-ID: 25935600:user:proton Received-SPF: pass client-ip=185.70.43.22; envelope-from=okamsn@protonmail.com; helo=mail-4322.protonmail.ch X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Mailman-Approved-At: Sun, 02 Apr 2023 00:53:26 -0400 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Xref: news.gmane.io gmane.emacs.devel:305030 Archived-At: This is a multi-part message in MIME format. --b1_6CXPuzS7ex2Kr7YtTLp1sNp1106cm7HlRVeV5dWjAc Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable On 2023-03-28 07:41 UTC, Philip Kaludercic wrote: >> From 1d4d4ebfd874d99d5e2d29078f3316f49dcf3136 Mon Sep 17 00:00:00 2001 >> From: Earl Hyatt >> Date: Mon, 27 Mar 2023 20:57:31 -0400 >> Subject: [PATCH] Add more documentation for the keys of >> `package-vc-selected-packages`. >> >> * doc/emacs/package.texi (Fetching Package Sources): List the >> accepted keys. >> * lisp/emacs-lisp/package-vc.el (package-vc-selected-packages): >> Mention the `:doc` key. >> --- >> doc/emacs/package.texi | 53 +++++++++++++++++++++++++++++++++++ >> lisp/emacs-lisp/package-vc.el | 4 +++ >> 2 files changed, 57 insertions(+) >> >> diff --git a/doc/emacs/package.texi b/doc/emacs/package.texi >> index 7a2bc11d03c..6f1fad2291a 100644 >> --- a/doc/emacs/package.texi >> +++ b/doc/emacs/package.texi >> @@ -578,3 +578,56 @@ Fetching Package Sources >> and initializes the code. Note that you might have to use >> @code{package-vc-refresh} to repeat the initialization and update the >> autoloads. > > Should a sub-heading inside the same node be added here? I have added one. > >> + >> +There are two ways for Emacs to learn how and whence to install a >> +package from source. The first way, when supported, is to > ^ > > The phrasing "when supported" doesn't sound clear. The user doesn't > know what this depends on. I have tried to make it clear that it depends on the archive. >> +automatically download the needed information from a package archive >> +(@pxref{Package Archives,,,elisp, The Emacs Lisp Reference Manual}). >> +This is what is done when only specifying the symbol of a package. > > I have the feeling the phrase "package specification" should be > mentioned somewhere here. I added this phrase. >> +@example >> +@group >> +(package-vc-install 'csv-mode) >> +@end group >> +@end example >> + >> +The second way is to specify this information manually in the first >> +argument of @code{package-vc-install}, in the form of >> +@samp{(@var{name} . @var{spec})}. @var{spec} should be a property >> +list using any of the following keys: >> + >> +@itemize @bullet >> +@item @code{:url} >> +A URL specifying the repository from which to fetch the package's >> +source code. >> + >> +@item @code{:branch} >> +The name of the branch to checkout after cloning the directory. > > At the risk of being pedantic, we check out the right branch /while/ > cloning, not /after/ cloning and I don't know if that matters. (I also > just now noticed that I used the same phrasing in the documentation > string for `package-vc-selected-packages'). I tried to do as Eli Zaretskii asked and changed it to be less Git specific. Does it still convey what you want? >> +@item @code{:lisp-dir} >> +The repository-relative name of the directory to use for loading the >> +Lisp sources, if not the root directory of the repository. >> + >> +@item @code{:main-file} >> +The main file of the project, from which to gather package metadata. >> +If not given, the assumed default is the package name with ".el" >> +appended to it. >> + >> +@item @code{:doc} >> +The repository-relative name of the documentation file from which to >> +build an Info file. This can be a TexInfo file or an Org file. >> + >> +@item @code{:vc-backend} >> +The VC backend to use for cloning the package. If omitted, >> +the process will fall back onto the archive default or onto >> +the value of @code{package-vc-default-backend}. > > Should we link to (emacs) Version Control here? Linked to the VC Concepts above the list. >> +;; Specifying information manually: >> +(package-vc-install >> + '(csv-mode :url "https://git.sv.gnu.org/git/emacs/elpa.git" >> + :branch "externals/csv-mode")) > > I worry that this example might be confusing, for those people who don't > know how ELPA works. It would either be worth mentioning that elpa.git > is a mirror with different packages on different branches, or to take > some other example (like AucTeX). I switched it to BBDB, which uses several keys. > I guess it will be good to also add :doc to the user option type. Done. On 2023-03-28 11:48 UTC, Eli Zaretskii wrote: >> +There are two ways for Emacs to learn how and whence to install a >> +package from source. The first way, when supported, is to >> +automatically download the needed information from a package archive >> +(@pxref{Package Archives,,,elisp, The Emacs Lisp Reference Manual}). >> +This is what is done when only specifying the symbol of a package. > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ > Passive voice alert! Could you perhaps rephrase this avoiding the > passive voice? I have reworded it. Please check again. >> +The second way is to specify this information manually in the first >> +argument of @code{package-vc-install}, in the form of >> +@samp{(@var{name} . @var{spec})}. @var{spec} should be a property > > This should be @code, not @samp. Done. >> +list using any of the following keys: >> + >> +@itemize @bullet > > This should be "@table @code", not @itemize. The result is more > readable. @itemize is for free text, not for systematic description > of several optional features and attributes. Done. >> +@item @code{:branch} >> +The name of the branch to checkout after cloning the directory. > ^^^^^^^^^^^^^^^^^^ ^^^^^^^^ ^^^^^^^ > Can we make this less Git-specific? Attempted, but I have only used Git. I linked to the VCS Concepts section above the list. >> +@item @code{:lisp-dir} >> +The repository-relative name of the directory to use for loading the >> +Lisp sources, if not the root directory of the repository. > > The "if not" part is confusing. I suggest ", which defaults to the > root directory of the repository" instead. Done. >> +@item @code{:main-file} >> +The main file of the project, from which to gather package metadata. >> +If not given, the assumed default is the package name with ".el" >> +appended to it. > > I'd drop the "assumed" part. It adds nothing to the description. Done. >> +@item @code{:doc} >> +The repository-relative name of the documentation file from which to >> +build an Info file. This can be a TexInfo file or an Org file. > ^^ > Two spaces there, please. Also, the spelling is "Texinfo", not > "TexInfo". Done. >> +@item @code{:vc-backend} >> +The VC backend to use for cloning the package. If omitted, > > A cross-reference here to the place where VC backends are described > would be good. Done. >> +the process will fall back onto the archive default or onto >> +the value of @code{package-vc-default-backend}. > > What does it mean to "fall back onto the archive default"? Each archive has a default backend. As that's not relevant to specifying the information manually, I've removed it. >> + `:doc' (string) >> + The documentation file from which to build an Info file. >> + This can be a TexInfo file or an Org file. > ^^^^^^^ > Spelling again. Fixed. --b1_6CXPuzS7ex2Kr7YtTLp1sNp1106cm7HlRVeV5dWjAc Content-Type: text/x-patch; charset=UTF-8; name=0001-Add-more-documentation-for-the-keys-of-package-vc-se.patch; name=0001-Add-more-documentation-for-the-keys-of-package-vc-se.patch Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename=0001-Add-more-documentation-for-the-keys-of-package-vc-se.patch RnJvbSAwMDI0NzI2YzI0ZjE2OTc2ZjFiNDcyYWZlOGUwNzllNTg5MjUxN2I1IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBFYXJsIEh5YXR0IDxva2Ftc25AcHJvdG9ubWFpbC5jb20+CkRh dGU6IE1vbiwgMjcgTWFyIDIwMjMgMjA6NTc6MzEgLTA0MDAKU3ViamVjdDogW1BBVENIXSBBZGQg bW9yZSBkb2N1bWVudGF0aW9uIGZvciB0aGUga2V5cyBvZgogYHBhY2thZ2UtdmMtc2VsZWN0ZWQt cGFja2FnZXNgLgoKKiBkb2MvZW1hY3MvcGFja2FnZS50ZXhpIChTcGVjaWZ5aW5nIFBhY2thZ2Ug U291cmNlcyk6IExpc3QgdGhlCiAgYWNjZXB0ZWQga2V5cyBpbiBhIG5ldyBzdWJzZWN0aW9uIG9m IEZldGNoaW5nIFBhY2thZ2UgU291cmNlcy4KCiogbGlzcC9lbWFjcy1saXNwL3BhY2thZ2UtdmMu ZWwgKHBhY2thZ2UtdmMtc2VsZWN0ZWQtcGFja2FnZXMpOgogIC0gTWVudGlvbiB0aGUgYDpkb2Ng IGtleS4gIEFkZCB0aGUgYDpkb2NgIGtleSB0byB0aGUgQ3VzdG9taXplIGZvcm0uCiAgLSBNZW50 aW9uIHRoZSBuZXcgSW5mbyBub2RlLgogIC0gQ29ycmVjdCAiVGV4SW5mbyIgdG8gIlRleGluZm8i LgogIC0gQXZvaWQgR2l0LXNwZWNpZmljIHRlcm1zIGZvciB0aGUgZGVzY3JpcHRpb24gb2YgYDpi cmFuY2hgLgogIC0gTWVudGlvbiBndWVzc2luZyBgOnZjLWJhY2tlbmRgIGJhc2VkIG9uIHRoZSBV UkwuCi0tLQogZG9jL2VtYWNzL3BhY2thZ2UudGV4aSAgICAgICAgfCA3NyArKysrKysrKysrKysr KysrKysrKysrKysrKysrKysrKysrKwogbGlzcC9lbWFjcy1saXNwL3BhY2thZ2UtdmMuZWwgfCAy NSArKysrKysrKy0tLS0KIDIgZmlsZXMgY2hhbmdlZCwgOTMgaW5zZXJ0aW9ucygrKSwgOSBkZWxl dGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kb2MvZW1hY3MvcGFja2FnZS50ZXhpIGIvZG9jL2VtYWNz L3BhY2thZ2UudGV4aQppbmRleCA3YTJiYzExZDAzYy4uN2FkNDE0M2QzY2IgMTAwNjQ0Ci0tLSBh L2RvYy9lbWFjcy9wYWNrYWdlLnRleGkKKysrIGIvZG9jL2VtYWNzL3BhY2thZ2UudGV4aQpAQCAt NTc4LDMgKzU3OCw4MCBAQCBGZXRjaGluZyBQYWNrYWdlIFNvdXJjZXMKIGFuZCBpbml0aWFsaXpl cyB0aGUgY29kZS4gIE5vdGUgdGhhdCB5b3UgbWlnaHQgaGF2ZSB0byB1c2UKIEBjb2Rle3BhY2th Z2UtdmMtcmVmcmVzaH0gdG8gcmVwZWF0IHRoZSBpbml0aWFsaXphdGlvbiBhbmQgdXBkYXRlIHRo ZQogYXV0b2xvYWRzLgorCitAc3Vic2VjdGlvbiBTcGVjaWZ5aW5nIFBhY2thZ2UgU291cmNlcwor QGNpbmRleCBwYWNrYWdlIHNwZWNpZmljYXRpb24KK0BjaW5kZXggc3BlY2lmaWNhdGlvbiwgZm9y IHNvdXJjZSBwYWNrYWdlcworCisgIFRvIGluc3RhbGwgYSBwYWNrYWdlIGZyb20gc291cmNlLCBF bWFjcyBtdXN0IGtub3cgd2hlcmUgdG8gZ2V0IHRoZQorcGFja2FnZSdzIHNvdXJjZSBjb2RlIChz dWNoIGFzIGEgY29kZSByZXBvc2l0b3J5KSBhbmQgYmFzaWMKK2luZm9ybWF0aW9uIGFib3V0IHRo ZSBzdHJ1Y3R1cmUgb2YgdGhlIGNvZGUgKHN1Y2ggYXMgdGhlIG1haW4gZmlsZSBpbgorYSBtdWx0 aS1maWxlIHBhY2thZ2UpLiAgVGhlc2UgdGhpbmdzIGFyZSBkZXNjcmliZWQgYnkgYSBwYWNrYWdl J3MKK0BkZm57c3BlY2lmaWNhdGlvbn0uCisKKyAgV2hlbiBzdXBwb3J0ZWQgYnkgYSBwYWNrYWdl IGFyY2hpdmUgKEBweHJlZntQYWNrYWdlCitBcmNoaXZlcywsLGVsaXNwLCBUaGUgRW1hY3MgTGlz cCBSZWZlcmVuY2UgTWFudWFsfSksIEVtYWNzIGNhbgorYXV0b21hdGljYWxseSBkb3dubG9hZCBh IHBhY2thZ2UncyBzcGVjaWZpY2F0aW9uIGZyb20gc2FpZCBhcmNoaXZlLgorSWYgdGhlIGZpcnN0 IGFyZ3VtZW50IHBhc3NlZCB0byBAY29kZXtwYWNrYWdlLXZjLWluc3RhbGx9IGlzIGEgc3ltYm9s CituYW1pbmcgYSBwYWNrYWdlLCB0aGVuIEVtYWNzIHdpbGwgdXNlIHRoZSBzcGVjaWZpY2F0aW9u IHByb3ZpZGVkIGJ5Cit0aGUgYXJjaGl2ZSBmb3IgdGhhdCBwYWNrYWdlLgorCitAZXhhbXBsZQor QGdyb3VwCis7OyBFbWFjcyB3aWxsIGRvd25sb2FkIEJCREIncyBzcGVjaWZpY2F0aW9uIGZyb20g R05VIEVMUEE6CisocGFja2FnZS12Yy1pbnN0YWxsICdiYmRiKQorQGVuZCBncm91cAorQGVuZCBl eGFtcGxlCisKKyAgQSBwYWNrYWdlJ3Mgc3BlY2lmaWNhdGlvbiBjYW4gYWxzbyBiZSBnaXZlbiBt YW51YWxseSBhcyB0aGUgZmlyc3QKK2FyZ3VtZW50IHRvIEBjb2Rle3BhY2thZ2UtdmMtaW5zdGFs bH0uICBUaGlzIGFsbG93cyB5b3UgdG8gaW5zdGFsbAorc291cmNlIHBhY2thZ2VzIGZyb20gbG9j YXRpb25zIG90aGVyIHRoYW4gdGhlIGtub3duIGFyY2hpdmVzIGxpc3RlZCBpbgordGhlIHVzZXIg b3B0aW9uIEBjb2Rle3BhY2thZ2UtYXJjaGl2ZXN9LiAgQSBwYWNrYWdlIHNwZWNpZmljYXRpb24g aXMgYQorbGlzdCBvZiB0aGUgZm9ybSBAY29kZXsoQHZhcntuYW1lfSAuIEB2YXJ7c3BlY30pfSwg aW4gd2hpY2ggQHZhcntzcGVjfQorc2hvdWxkIGJlIGEgcHJvcGVydHkgbGlzdCB1c2luZyBhbnkg b2YgdGhlIGZvbGxvd2luZyBrZXlzLgorCitGb3IgZGVmaW5pdGlvbnMgb2YgYmFzaWMgdGVybXMg Zm9yIHdvcmtpbmcgd2l0aCBjb2RlIHJlcG9zaXRvcmllcyBhbmQKK3ZlcnNpb24gY29udHJvbCBz eXN0ZW1zLCBzZWUgQHhyZWZ7VkNTIENvbmNlcHRzLCwsZW1hY3MsIFRoZSBHTlUgRW1hY3MKK01h bnVhbH0uCisKK0B0YWJsZSBAY29kZQorQGl0ZW0gOnVybAorQSBzdHJpbmcgY29udGFpbmluZyB0 aGUgVVJMIHRoYXQgc3BlY2lmaWVzIHRoZSByZXBvc2l0b3J5IGZyb20gd2hpY2gKK3RvIGZldGNo IHRoZSBwYWNrYWdlJ3Mgc291cmNlIGNvZGUuCisKK0BpdGVtIDpicmFuY2gKK0Egc3RyaW5nIGNv bnRhaW5pbmcgdGhlIHJldmlzaW9uIG9mIHRoZSBjb2RlIHRvIGluc3RhbGwuICBUaGlzIGlzIG5v dAordG8gYmUgY29uZnVzZWQgd2l0aCBhIHBhY2thZ2UncyB2ZXJzaW9uIG51bWJlci4KKworQGl0 ZW0gOmxpc3AtZGlyCitBIHN0cmluZyBjb250YWluaW5nIHRoZSByZXBvc2l0b3J5LXJlbGF0aXZl IG5hbWUgb2YgdGhlIGRpcmVjdG9yeSB0bwordXNlIGZvciBsb2FkaW5nIHRoZSBMaXNwIHNvdXJj ZXMsIHdoaWNoIGRlZmF1bHRzIHRvIHRoZSByb290IGRpcmVjdG9yeQorb2YgdGhlIHJlcG9zaXRv cnkuCisKK0BpdGVtIDptYWluLWZpbGUKK0Egc3RyaW5nIGNvbnRhaW5pbmcgdGhlIG1haW4gZmls ZSBvZiB0aGUgcHJvamVjdCwgZnJvbSB3aGljaCB0byBnYXRoZXIKK3BhY2thZ2UgbWV0YWRhdGEu ICBJZiBub3QgZ2l2ZW4sIHRoZSBkZWZhdWx0IGlzIHRoZSBwYWNrYWdlIG5hbWUgd2l0aAorIi5l bCIgYXBwZW5kZWQgdG8gaXQuCisKK0BpdGVtIDpkb2MKK0Egc3RyaW5nIGNvbnRhaW5pbmcgdGhl IHJlcG9zaXRvcnktcmVsYXRpdmUgbmFtZSBvZiB0aGUgZG9jdW1lbnRhdGlvbgorZmlsZSBmcm9t IHdoaWNoIHRvIGJ1aWxkIGFuIEluZm8gZmlsZS4gIFRoaXMgY2FuIGJlIGEgVGV4aW5mbyBmaWxl IG9yCithbiBPcmcgZmlsZS4KKworQGl0ZW0gOnZjLWJhY2tlbmQKK0Egc3ltYm9sIG5hbWluZyB0 aGUgVkMgYmFja2VuZCB0byB1c2UgZm9yIGRvd25sb2FkaW5nIGEgY29weSBvZiB0aGUKK3BhY2th Z2UncyByZXBvc2l0b3J5IChAcHhyZWZ7VmVyc2lvbiBDb250cm9sIFN5c3RlbXMsLCxlbWFjcywg VGhlIEdOVQorRW1hY3MgTWFudWFsfSkuICBJZiBvbWl0dGVkLCBhIGd1ZXNzIHdpbGwgYmUgbWFk ZSBiYXNlZCBvbiB0aGUKK3Byb3ZpZGVkIFVSTCwgb3IsIGZhaWxpbmcgdGhhdCwgdGhlIHByb2Nl c3Mgd2lsbCBmYWxsIGJhY2sgb250byB0aGUKK3ZhbHVlIG9mIEBjb2Rle3BhY2thZ2UtdmMtZGVm YXVsdC1iYWNrZW5kfS4KK0BlbmQgdGFibGUKKworQGV4YW1wbGUKK0Bncm91cAorOzsgU3BlY2lm eWluZyBpbmZvcm1hdGlvbiBtYW51YWxseToKKyhwYWNrYWdlLXZjLWluc3RhbGwKKyAgJyhiYmRi IDp1cmwgImh0dHBzOi8vZ2l0LnNhdmFubmFoLm5vbmdudS5vcmcvZ2l0L2JiZGIuZ2l0IgorICAg ICAgICAgOmxpc3AtZGlyICJsaXNwIgorICAgICAgICAgOmRvYyAiZG9jL2JiZGIudGV4aSIpKQor QGVuZCBncm91cAorQGVuZCBleGFtcGxlCmRpZmYgLS1naXQgYS9saXNwL2VtYWNzLWxpc3AvcGFj a2FnZS12Yy5lbCBiL2xpc3AvZW1hY3MtbGlzcC9wYWNrYWdlLXZjLmVsCmluZGV4IDI1M2IzNWYx ZjFhLi5jYmM5YTFlY2VjZSAxMDA2NDQKLS0tIGEvbGlzcC9lbWFjcy1saXNwL3BhY2thZ2UtdmMu ZWwKKysrIGIvbGlzcC9lbWFjcy1saXNwL3BhY2thZ2UtdmMuZWwKQEAgLTE1MiwyNSArMTUyLDMx IEBAIHBhY2thZ2UtdmMtc2VsZWN0ZWQtcGFja2FnZXMKICAgICAgIFRoZSBVUkwgb2YgdGhlIHJl cG9zaXRvcnkgdXNlZCB0byBmZXRjaCB0aGUgcGFja2FnZSBzb3VyY2UuCiAKICAgIGA6YnJhbmNo JyAoc3RyaW5nKQotICAgICAgSWYgZ2l2ZW4sIHRoZSBuYW1lIG9mIHRoZSBicmFuY2ggdG8gY2hl Y2tvdXQgYWZ0ZXIgY2xvbmluZyB0aGUgZGlyZWN0b3J5LgorICAgICAgVGhlIHJlcG9zaXRvcnkt c3BlY2lmaWMgcmV2aXNpb24gb2YgdGhlIGNvZGUgdG8gaW5zdGFsbC4KKyAgICAgIFRoaXMgaXMg bm90IHRvIGJlIGNvbmZ1c2VkIHdpdGggYSBwYWNrYWdlJ3MgdmVyc2lvbiBudW1iZXIuCiAKICAg IGA6bGlzcC1kaXInIChzdHJpbmcpCiAgICAgICBUaGUgcmVwb3NpdG9yeS1yZWxhdGl2ZSBuYW1l IG9mIHRoZSBkaXJlY3RvcnkgdG8gdXNlIGZvciBsb2FkaW5nIHRoZSBMaXNwCi0gICAgICBzb3Vy Y2VzLiAgSWYgbm90IGdpdmVuLCB0aGUgdmFsdWUgZGVmYXVsdHMgdG8gdGhlIHJvb3QgZGlyZWN0 b3J5Ci0gICAgICBvZiB0aGUgcmVwb3NpdG9yeS4KKyAgICAgIHNvdXJjZXMsIHdoaWNoIGRlZmF1 bHRzIHRvIHRoZSByb290IGRpcmVjdG9yeSBvZiB0aGUgcmVwb3NpdG9yeS4KIAogICAgYDptYWlu LWZpbGUnIChzdHJpbmcpCiAgICAgICBUaGUgbWFpbiBmaWxlIG9mIHRoZSBwcm9qZWN0LCByZWxl dmFudCB0byBnYXRoZXIgcGFja2FnZSBtZXRhZGF0YS4KLSAgICAgIElmIG5vdCBnaXZlbiwgdGhl IGFzc3VtZWQgZGVmYXVsdCBpcyB0aGUgcGFja2FnZSBuYW1lIHdpdGggXCIuZWxcIgorICAgICAg SWYgbm90IGdpdmVuLCB0aGUgZGVmYXVsdCBpcyB0aGUgcGFja2FnZSBuYW1lIHdpdGggXCIuZWxc IgogICAgICAgYXBwZW5kZWQgdG8gaXQuCiAKKyAgIGA6ZG9jJyAoc3RyaW5nKQorICAgICAgVGhl IGRvY3VtZW50YXRpb24gZmlsZSBmcm9tIHdoaWNoIHRvIGJ1aWxkIGFuIEluZm8gZmlsZS4KKyAg ICAgIFRoaXMgY2FuIGJlIGEgVGV4aW5mbyBmaWxlIG9yIGFuIE9yZyBmaWxlLgorCiAgICBgOnZj LWJhY2tlbmQnIChzeW1ib2wpCi0gICAgICBBIHN5bWJvbCBvZiB0aGUgVkMgYmFja2VuZCB0byB1 c2UgZm9yIGNsb25pbmcgdGhlIHBhY2thZ2UuICBUaGUKLSAgICAgIHZhbHVlIG91Z2h0IHRvIGJl IGEgbWVtYmVyIG9mIGB2Yy1oYW5kbGVkLWJhY2tlbmRzJy4gIElmIG9taXR0ZWQsCi0gICAgICBg dmMtY2xvbmUnIHdpbGwgZmFsbCBiYWNrIG9udG8gdGhlIGFyY2hpdmUgZGVmYXVsdCBvciBvbgot ICAgICAgYHBhY2thZ2UtdmMtZGVmYXVsdC1iYWNrZW5kJy4KKyAgICAgIEEgc3ltYm9sIG9mIHRo ZSBWQyBiYWNrZW5kIHRvIHVzZSBmb3IgY2xvbmluZyB0aGUgcGFja2FnZS4KKyAgICAgIFRoZSB2 YWx1ZSBvdWdodCB0byBiZSBhIG1lbWJlciBvZiBgdmMtaGFuZGxlZC1iYWNrZW5kcycuCisgICAg ICBJZiBvbWl0dGVkLCBhIGd1ZXNzIHdpbGwgYmUgbWFkZSBiYXNlZCBvbiB0aGUgcHJvdmlkZWQg VVJMLAorICAgICAgb3IsIGZhaWxpbmcgdGhhdCwgYHZjLWNsb25lJyB3aWxsIGZhbGwgYmFjayBv bnRvIHRoZQorICAgICAgYXJjaGl2ZSBkZWZhdWx0IG9yIG9uIGBwYWNrYWdlLXZjLWRlZmF1bHQt YmFja2VuZCcuCiAKLSAgQWxsIG90aGVyIGtleXMgYXJlIGlnbm9yZWQuCisgIEFsbCBvdGhlciBr ZXlzIGFyZSBpZ25vcmVkLiAgUGFja2FnZSBzcGVjaWZpY2F0aW9ucyBhcmUgZnVydGhlcgorICBk ZXNjcmliZWQgaW4gdGhlIEluZm8gbm9kZSBgKGVtYWNzKUZldGNoaW5nIFBhY2thZ2UgU291cmNl cycuCiAKIFRoaXMgdXNlciBvcHRpb24gd2lsbCBiZSBhdXRvbWF0aWNhbGx5IHVwZGF0ZWQgdG8g c3RvcmUgcGFja2FnZQogc3BlY2lmaWNhdGlvbnMgZm9yIHBhY2thZ2VzIHRoYXQgYXJlIG5vdCBz cGVjaWZpZWQgaW4gYW55CkBAIC0xODQsNiArMTkwLDcgQEAgcGFja2FnZS12Yy1zZWxlY3RlZC1w YWNrYWdlcwogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAoOmJyYW5j aCBzdHJpbmcpCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICg6bGlz cC1kaXIgc3RyaW5nKQogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAo Om1haW4tZmlsZSBzdHJpbmcpCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICg6ZG9jIHN0cmluZykKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgKDp2Yy1iYWNrZW5kIHN5bWJvbCkpKSkpCiAgIDp2ZXJzaW9uICIyOS4xIikKIAotLSAKMi4z NC4xCgo= --b1_6CXPuzS7ex2Kr7YtTLp1sNp1106cm7HlRVeV5dWjAc--