From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: util-linux-owner@vger.kernel.org Received: from out5-smtp.messagingengine.com ([66.111.4.29]:52971 "EHLO out5-smtp.messagingengine.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756592Ab3AYRRS (ORCPT ); Fri, 25 Jan 2013 12:17:18 -0500 Message-Id: <1359134237.29464.140661182331017.5B74A451@webmail.messagingengine.com> From: Benno Schulenberg To: Karel Zak Cc: "Util-Linux" MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="_----------=_1359134237294643"; charset="utf-8" In-Reply-To: <20130125163611.GC1954@x2.net.home> References: <1358956950.25102.140661181364417.13137B26@webmail.messagingengine.com> <20130125163611.GC1954@x2.net.home> Subject: Re: [patches] some proper pluralization, and a bunch of textual fixes Date: Fri, 25 Jan 2013 18:17:17 +0100 Sender: util-linux-owner@vger.kernel.org List-ID: This is a multi-part message in MIME format. --_----------=_1359134237294643 Content-Transfer-Encoding: 7bit Content-Type: text/plain On Fri, Jan 25, 2013, at 17:36, Karel Zak wrote: > On Wed, Jan 23, 2013 at 05:02:30PM +0100, Benno Schulenberg wrote: > > The eighth patch standardizes the version reporting to: > > "program from util-linux-x.xx.x". > > It seems that Sami, you and I did the same changes. Please, can you > pull from upstream repo and rebase this set of the patches? Yes, done. Just patch 7 and 8 changed, the content of the others stayed the same, so I attached just those two. Benno -- http://www.fastmail.fm - A fast, anti-spam email service. --_----------=_1359134237294643 Content-Disposition: attachment; filename="0007-mkfs-indicate-that-specifying-fs-type-and-fs-options.patch" Content-Id: <1359134136.28840.29aa3d0a249a78a6d70a36ec2f85a33a557aec55.49126224@messagingengine.com> Content-Transfer-Encoding: base64 Content-Type: text/x-patch; name="0007-mkfs-indicate-that-specifying-fs-type-and-fs-options.patch" RnJvbSAxNjk3N2M4NTAyNTE2Nzg3MDdjMzk3OTlkMWNkYjI1YjFjMWFmNTQ5 IE1vbiBTZXAgMTcgMDA6MDA6MDAgMjAwMQpGcm9tOiBCZW5ubyBTY2h1bGVu YmVyZyA8YmVuc2JlcmdAanVzdGVtYWlsLm5ldD4KRGF0ZTogVHVlLCAyMiBK YW4gMjAxMyAxMTo1Njo1OCArMDEwMApTdWJqZWN0OiBbUEFUQ0ggMDcvMTBd IG1rZnM6IGluZGljYXRlIHRoYXQgc3BlY2lmeWluZyBmcy10eXBlIGFuZCBm cy1vcHRpb25zIGFyZSBpbmRlcGVuZGVudAoKQWxzbyBzdGFuZGFyZGl6ZSBh bmQgaW1wcm92ZSB0aGUgaGVscCB0ZXh0LCBhbmQgc2xpY2UgaXQgaW50byBz dHJpcHMKZm9yIGVhc2Ugb2YgbGF0ZXIgdHJhbnNsYXRpb24gbWFpbnRlbmFu Y2UuCgpTaWduZWQtb2ZmLWJ5OiBCZW5ubyBTY2h1bGVuYmVyZyA8YmVuc2Jl cmdAanVzdGVtYWlsLm5ldD4KLS0tCiBkaXNrLXV0aWxzL21rZnMuOCB8ICAg IDIgKy0KIGRpc2stdXRpbHMvbWtmcy5jIHwgICAyOCArKysrKysrKysrKysr Ky0tLS0tLS0tLS0tLS0tCiAyIGZpbGVzIGNoYW5nZWQsIDE1IGluc2VydGlv bnMoKyksIDE1IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2Rpc2stdXRp bHMvbWtmcy44IGIvZGlzay11dGlscy9ta2ZzLjgKaW5kZXggYWY5MzA0Yi4u YTRjZGY3MSAxMDA2NDQKLS0tIGEvZGlzay11dGlscy9ta2ZzLjgKKysrIGIv ZGlzay11dGlscy9ta2ZzLjgKQEAgLTcsNyArNyw3IEBAIG1rZnMgXC0gYnVp bGQgYSBMaW51eCBmaWxlc3lzdGVtCiAuQiBta2ZzCiAuUkkgWyBvcHRpb25z IF0KIC5SQiBbIFwtdAotLklSICJ0eXBlIGZzLW9wdGlvbnMiIF0gIiBkZXZp Y2UgIiBbIHNpemUgXQorLklSIHR5cGUgIl0gWyIgZnMtb3B0aW9ucyBdICIg ZGV2aWNlICIgWyBzaXplIF0KIC5TSCBERVNDUklQVElPTgogLkIgbWtmcwog aXMgdXNlZCB0byBidWlsZCBhIExpbnV4IGZpbGVzeXN0ZW0gb24gYSBkZXZp Y2UsIHVzdWFsbHkKZGlmZiAtLWdpdCBhL2Rpc2stdXRpbHMvbWtmcy5jIGIv ZGlzay11dGlscy9ta2ZzLmMKaW5kZXggNTU1MDZjMC4uYzM0ZjlmNiAxMDA2 NDQKLS0tIGEvZGlzay11dGlscy9ta2ZzLmMKKysrIGIvZGlzay11dGlscy9t a2ZzLmMKQEAgLTM1LDIwICszNSwyMCBAQAogCiBzdGF0aWMgdm9pZCBfX2F0 dHJpYnV0ZV9fICgoX19ub3JldHVybl9fKSkgdXNhZ2UoRklMRSAqIG91dCkK IHsKLQlmcHJpbnRmKG91dCwKLQkJXygiVXNhZ2U6ICVzIFtvcHRpb25zXSBb LXQgdHlwZSBmcy1vcHRpb25zXSBkZXZpY2UgW3NpemVdXG4iKSwKLQkJcHJv Z3JhbV9pbnZvY2F0aW9uX3Nob3J0X25hbWUpOwotCi0JZnByaW50ZihvdXQs IF8oIlxuT3B0aW9uczpcbiIKLQkJICAgICAgICIgLXQsIC0tdHlwZT1UWVBF ICBmaWxlIHN5c3RlbSB0eXBlLCB3aGVuIHVuZGVmaW5lZCBleHQyIGlzIHVz ZWRcbiIKLQkJICAgICAgICIgICAgIGZzLW9wdGlvbnMgICBwYXJhbWV0ZXJz IHRvIHJlYWwgZmlsZSBzeXN0ZW0gYnVpbGRlclxuIgotCQkgICAgICAgIiAg ICAgZGV2aWNlICAgICAgIHBhdGggdG8gYSBkZXZpY2VcbiIKLQkJICAgICAg ICIgICAgIHNpemUgICAgICAgICBudW1iZXIgb2YgYmxvY2tzIG9uIHRoZSBk ZXZpY2VcbiIKLQkJICAgICAgICIgLVYsIC0tdmVyYm9zZSAgICBleHBsYWlu IHdoYXQgaXMgZG9uZVxuIgotCQkgICAgICAgIiAgICAgICAgICAgICAgICAg IGRlZmluaW5nIC1WIG1vcmUgdGhhbiBvbmNlIHdpbGwgY2F1c2UgYSBkcnkt cnVuXG4iCi0JCSAgICAgICAiIC1WLCAtLXZlcnNpb24gICAgb3V0cHV0IHZl cnNpb24gaW5mb3JtYXRpb24gYW5kIGV4aXRcbiIKLQkJICAgICAgICIgICAg ICAgICAgICAgICAgICAtViBhcyB2ZXJzaW9uIG11c3QgYmUgb25seSBvcHRp b25cbiIKLQkJICAgICAgICIgLWgsIC0taGVscCAgICAgICBkaXNwbGF5IHRo aXMgaGVscCBhbmQgZXhpdFxuIikpOworCWZwcmludGYob3V0LCBfKCJVc2Fn ZTpcbiIpKTsKKwlmcHJpbnRmKG91dCwgXygiICVzIFtvcHRpb25zXSBbLXQg PHR5cGU+XSBbZnMtb3B0aW9uc10gPGRldmljZT4gWzxzaXplPl1cbiIpLAor CQkgICAgIHByb2dyYW1faW52b2NhdGlvbl9zaG9ydF9uYW1lKTsKKworCWZw cmludGYob3V0LCBfKCJcbk9wdGlvbnM6XG4iKSk7CisJZnByaW50ZihvdXQs IF8oIiAtdCwgLS10eXBlPTx0eXBlPiAgZmlsZXN5c3RlbSB0eXBlOyB3aGVu IHVuc3BlY2lmaWVkLCBleHQyIGlzIHVzZWRcbiIpKTsKKwlmcHJpbnRmKG91 dCwgXygiICAgICBmcy1vcHRpb25zICAgICBwYXJhbWV0ZXJzIGZvciB0aGUg cmVhbCBmaWxlc3lzdGVtIGJ1aWxkZXJcbiIpKTsKKwlmcHJpbnRmKG91dCwg XygiICAgICA8ZGV2aWNlPiAgICAgICBwYXRoIHRvIHRoZSBkZXZpY2UgdG8g YmUgdXNlZFxuIikpOworCWZwcmludGYob3V0LCBfKCIgICAgIDxzaXplPiAg ICAgICAgIG51bWJlciBvZiBibG9ja3MgdG8gYmUgdXNlZCBvbiB0aGUgZGV2 aWNlXG4iKSk7CisJZnByaW50ZihvdXQsIF8oIiAtViwgLS12ZXJib3NlICAg ICAgZXhwbGFpbiB3aGF0IGlzIGJlaW5nIGRvbmU7XG4iCisJCSAgICAgICAi ICAgICAgICAgICAgICAgICAgICAgIHNwZWNpZnlpbmcgLVYgbW9yZSB0aGFu IG9uY2Ugd2lsbCBjYXVzZSBhIGRyeS1ydW5cbiIpKTsKKwlmcHJpbnRmKG91 dCwgXygiIC1WLCAtLXZlcnNpb24gICAgICBkaXNwbGF5IHZlcnNpb24gaW5m b3JtYXRpb24gYW5kIGV4aXQ7XG4iCisJCSAgICAgICAiICAgICAgICAgICAg ICAgICAgICAgIC1WIGFzIC0tdmVyc2lvbiBtdXN0IGJlIHRoZSBvbmx5IG9w dGlvblxuIikpOworCWZwcmludGYob3V0LCBfKCIgLWgsIC0taGVscCAgICAg ICAgIGRpc3BsYXkgdGhpcyBoZWxwIHRleHQgYW5kIGV4aXRcbiIpKTsKIAog CWZwcmludGYob3V0LCBfKCJcbkZvciBtb3JlIGluZm9ybWF0aW9uIHNlZSBt a2ZzKDgpLlxuIikpOwogCi0tIAoxLjcuMC40Cgo= --_----------=_1359134237294643 Content-Disposition: attachment; filename="0008-textual-standardize-the-reporting-of-program-name-pl.patch" Content-Id: <1359134160.29362.bfd945d65732ab5a49a54f07fdf72ea1a43c3dd9.715BF767@messagingengine.com> Content-Transfer-Encoding: base64 Content-Type: text/x-patch; name="0008-textual-standardize-the-reporting-of-program-name-pl.patch" RnJvbSA2MGY0ZDBlMzY1ZmE1MDNkMTE0OTZlMzdmMzc5M2VjNmM4MDU1MzY1 IE1vbiBTZXAgMTcgMDA6MDA6MDAgMjAwMQpGcm9tOiBCZW5ubyBTY2h1bGVu YmVyZyA8YmVuc2JlcmdAanVzdGVtYWlsLm5ldD4KRGF0ZTogV2VkLCAyMyBK YW4gMjAxMyAxMzo0ODo1MCArMDEwMApTdWJqZWN0OiBbUEFUQ0ggMDgvMTBd IHRleHR1YWw6IHN0YW5kYXJkaXplIHRoZSByZXBvcnRpbmcgb2YgcHJvZ3Jh bSBuYW1lIHBsdXMgcGFja2FnZSB2ZXJzaW9uCgpTaWduZWQtb2ZmLWJ5OiBC ZW5ubyBTY2h1bGVuYmVyZyA8YmVuc2JlcmdAanVzdGVtYWlsLm5ldD4KLS0t CiBkaXNrLXV0aWxzL2ZzY2subWluaXguYyB8ICAgIDIgKy0KIHN5cy11dGls cy9mbG9jay5jICAgICAgIHwgICAgMyArLS0KIHRleHQtdXRpbHMvbW9yZS5j ICAgICAgIHwgICAgMyArLS0KIDMgZmlsZXMgY2hhbmdlZCwgMyBpbnNlcnRp b25zKCspLCA1IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2Rpc2stdXRp bHMvZnNjay5taW5peC5jIGIvZGlzay11dGlscy9mc2NrLm1pbml4LmMKaW5k ZXggNTRlNTkxOC4uZmU5MjA4NSAxMDA2NDQKLS0tIGEvZGlzay11dGlscy9m c2NrLm1pbml4LmMKKysrIGIvZGlzay11dGlscy9mc2NrLm1pbml4LmMKQEAg LTIxMyw3ICsyMTMsNyBAQCBzdGF0aWMgdm9pZAogZGllKGNvbnN0IGNoYXIg KmZtdCwgLi4uKSB7CiAJdmFfbGlzdCBhcDsKIAotCWZwcmludGYoc3RkZXJy LCAiJXM6ICIsIHByb2dyYW1faW52b2NhdGlvbl9zaG9ydF9uYW1lKTsKKwlm cHJpbnRmKHN0ZGVyciwgVVRJTF9MSU5VWF9WRVJTSU9OKTsKIAl2YV9zdGFy dChhcCwgZm10KTsKIAl2ZnByaW50ZihzdGRlcnIsIGZtdCwgYXApOwogCXZh X2VuZChhcCk7CmRpZmYgLS1naXQgYS9zeXMtdXRpbHMvZmxvY2suYyBiL3N5 cy11dGlscy9mbG9jay5jCmluZGV4IDExYzQ0YjYuLjYxNDdlOTcgMTAwNjQ0 Ci0tLSBhL3N5cy11dGlscy9mbG9jay5jCisrKyBiL3N5cy11dGlscy9mbG9j ay5jCkBAIC0yMDYsOCArMjA2LDcgQEAgaW50IG1haW4oaW50IGFyZ2MsIGNo YXIgKmFyZ3ZbXSkKIAkJCQlfKCJpbnZhbGlkIGV4aXQgY29kZSIpKTsKIAkJ CWJyZWFrOwogCQljYXNlICdWJzoKLQkJCXByaW50ZihfKCIlcyBmcm9tICVz XG4iKSwKLQkJCSAgICAgICBwcm9ncmFtX2ludm9jYXRpb25fc2hvcnRfbmFt ZSwgUEFDS0FHRV9TVFJJTkcpOworCQkJcHJpbnRmKFVUSUxfTElOVVhfVkVS U0lPTik7CiAJCQlleGl0KEVYX09LKTsKIAkJZGVmYXVsdDoKIAkJCS8qIG9w dG9wdCB3aWxsIGJlIHNldCBpZiB0aGlzIHdhcyBhbiB1bnJlY29nbml6ZWQK ZGlmZiAtLWdpdCBhL3RleHQtdXRpbHMvbW9yZS5jIGIvdGV4dC11dGlscy9t b3JlLmMKaW5kZXggMmM5Nzk1MC4uYjk0YWU0OSAxMDA2NDQKLS0tIGEvdGV4 dC11dGlscy9tb3JlLmMKKysrIGIvdGV4dC11dGlscy9tb3JlLmMKQEAgLTU2 OCw4ICs1NjgsNyBAQCB2b2lkIGFyZ3NjYW4oY2hhciAqcykKIAkJY2FzZSAn XHQnOgogCQkJYnJlYWs7CiAJCWNhc2UgJ1YnOgotICAgICAgICAgICAgICAg ICAgICAgICAgcHJpbnRmKF8oIiVzIGZyb20gJXNcbiIpLAotICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgIHByb2dyYW1faW52b2NhdGlvbl9zaG9y dF9uYW1lLCBQQUNLQUdFX1NUUklORyk7CisJCQlwcmludGYoVVRJTF9MSU5V WF9WRVJTSU9OKTsKIAkJCWV4aXQoRVhJVF9TVUNDRVNTKTsKIAkJCWJyZWFr OwogCQlkZWZhdWx0OgotLSAKMS43LjAuNAoK --_----------=_1359134237294643--