From patchwork Fri Sep 14 17:10:55 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jelle van der Waa X-Patchwork-Id: 775 Return-Path: Delivered-To: patchwork@archlinux.org Received: from apollo.archlinux.org (localhost [127.0.0.1]) by apollo.archlinux.org (Postfix) with ESMTP id 08C1C6E41E54 for ; Fri, 14 Sep 2018 17:11:03 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.1 (2015-04-28) on apollo X-Spam-Level: X-Spam-Status: No, score=-3.2 required=5.0 tests=BAYES_00=-1,DKIM_SIGNED=0.1, MAILING_LIST_MULTI=-1,RCVD_IN_DNSWL_MED=-2.3,T_DKIM_INVALID=1 autolearn=ham autolearn_force=no version=3.4.1 X-Spam-BL-Results: [127.0.0.11] [127.0.9.2] Received: from orion.archlinux.org (orion.archlinux.org [IPv6:2a01:4f8:160:6087::1]) by apollo.archlinux.org (Postfix) with ESMTPS for ; Fri, 14 Sep 2018 17:11:02 +0000 (UTC) Received: from orion.archlinux.org (localhost [127.0.0.1]) by orion.archlinux.org (Postfix) with ESMTP id 95135D61DAF0F; Fri, 14 Sep 2018 17:11:01 +0000 (UTC) Received: from luna.archlinux.org (luna.archlinux.org [IPv6:2a01:4f8:160:3033::2]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by orion.archlinux.org (Postfix) with ESMTPS; Fri, 14 Sep 2018 17:11:01 +0000 (UTC) Received: from luna.archlinux.org (luna.archlinux.org [127.0.0.1]) by luna.archlinux.org (Postfix) with ESMTP id 848F62D638; Fri, 14 Sep 2018 17:11:01 +0000 (UTC) Authentication-Results: luna.archlinux.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=vdwaa-nl.20150623.gappssmtp.com header.i=@vdwaa-nl.20150623.gappssmtp.com header.b=Y5J7zLls Received: from luna.archlinux.org (luna.archlinux.org [127.0.0.1]) by luna.archlinux.org (Postfix) with ESMTP id C285B2D638 for ; Fri, 14 Sep 2018 17:10:59 +0000 (UTC) Received: from mail-ed1-x534.google.com (mail-ed1-x534.google.com [IPv6:2a00:1450:4864:20::534]) by luna.archlinux.org (Postfix) with ESMTPS for ; Fri, 14 Sep 2018 17:10:59 +0000 (UTC) Received: by mail-ed1-x534.google.com with SMTP id k14-v6so7976995edr.13 for ; Fri, 14 Sep 2018 10:10:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=vdwaa-nl.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=j1hpRmYazRqA/7iu6aynWokoUoybNFviNwFHuVVv0CM=; b=Y5J7zLlsnEemtd7nNhUvCkYvvrdK+fyuVJ5Axlen2UD/Bx3oXOVbILTl7agUJx9DCw grOEOOyICyAadWgijG25szCLnLpcVCgXZkYUUPp+Cu0ieJX/pzKKej9UW1Xww/5yJzR6 oTwBZPdcUjBIKDkIQpyoX0NdrgJLmQuqseVdpoMDE4F3ztD3n/06OpA0HC0kTJuDF3bk JfOzkeP49zjvcACGwt4Y+FJX+3EWmRW2FqYrQWiM+4C5E3qgsNMQCLH31hGTIdQ9EjPL SvDvlxnWcBwEti+FTksL9yz9CNMuj5idGR/t56lLyuxEfdTfEyi6sCc59QrsPK8milaw xwJg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=j1hpRmYazRqA/7iu6aynWokoUoybNFviNwFHuVVv0CM=; b=K7uy1KkMBs9CyxwS4bMGtmtysLYhuWugTMeHUROZ0gvqRv7hEpcx13NUfCR8smB5jF Ot9YmMXNY5xDW199PGLrxG+nX3pr9X1QCx7vxbOo83e1Wz1UtFk5ZUgAVYY6hwQGqXBI PH5HByyjZS3JVYxlmMCtBhkhxCJSuqes2mbaUmKcjQrRvN370jNiV76bDMXib8SWA4NP /7sxPDaDoRRnPe4AkzvTDXdaUnSFbU3Ea/CNEmaFHDGBXv6GhJDCK3VNvPyLK5+7yL99 /b84Nn5R835N00kx4EAhCtqxrZ6HPQPvyQ5ZxND+nTT0RAG/s1JXsnWIwvOOo1M6TaGy kNWQ== X-Gm-Message-State: APzg51DB+RaylpeUhGQ6IGXtNAENh9PuAmTpmx7+h1a4XUBSOb8Qz+nv P/YGyNHjRyg+up8ZVVgQze1Z/SerWnU= X-Google-Smtp-Source: ANB0VdZwWZW/EnoPR+Vyfb5TN8hjBBrM5BnS3hd2ipkp2J4DEBDDH/7nWA2/PdK7YCRsv+syTkbcBw== X-Received: by 2002:a50:b1d1:: with SMTP id n17-v6mr21483043edd.52.1536945058969; Fri, 14 Sep 2018 10:10:58 -0700 (PDT) Received: from helium.space.revspace.nl (53547DC9.cm-6-5b.dynamic.ziggo.nl. [83.84.125.201]) by smtp.gmail.com with ESMTPSA id p10-v6sm2925533edh.9.2018.09.14.10.10.57 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 14 Sep 2018 10:10:58 -0700 (PDT) From: Jelle van der Waa To: pacman-contrib@lists.archlinux.org Subject: [pacman-contrib] [PATCH] doc: Add man page for pacdiff Date: Fri, 14 Sep 2018 19:10:55 +0200 Message-Id: <20180914171055.6643-1-jelle@vdwaa.nl> X-Mailer: git-send-email 2.19.0 MIME-Version: 1.0 X-BeenThere: pacman-contrib@lists.archlinux.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion list for pacman-contrib development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: pacman-contrib-bounces@lists.archlinux.org Sender: "pacman-contrib" --- doc/Makefile.am | 4 ++++ doc/pacdiff.8.txt | 55 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 59 insertions(+) create mode 100644 doc/pacdiff.8.txt diff --git a/doc/Makefile.am b/doc/Makefile.am index cf48bb5..65bc4f5 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -5,10 +5,12 @@ ASCIIDOC_MANS = \ paccache.8 \ + pacdiff.8 \ pactree.8 HTML_MANPAGES = \ paccache.8.html \ + pacdiff.8.html \ pactree.8.html HTML_OTHER = \ @@ -22,6 +24,7 @@ EXTRA_DIST = \ asciidoc.conf \ asciidoc-override.css \ paccache.8.txt \ + pacdiff.8.txt \ pactree.8.txt \ footer.txt \ $(ASCIIDOC_MANS) @@ -98,6 +101,7 @@ $(HTML_OTHER): asciidoc.conf Makefile.am # Dependency rules paccache.8 paccache.8.html: paccache.8.txt +pacdiff.8 pacdiff.8.html: pacdiff.8.txt pactree.8 pactree.8.html: pactree.8.txt # vim:set noet: diff --git a/doc/pacdiff.8.txt b/doc/pacdiff.8.txt new file mode 100644 index 0000000..a4c5850 --- /dev/null +++ b/doc/pacdiff.8.txt @@ -0,0 +1,55 @@ +///// +vim:set ts=4 sw=4 syntax=asciidoc noet spell spelllang=en_us: +///// +pacdiff(8) +========== + +Name +---- +pacdiff - pacorig, pacnew and pacsave maintenance utility + + +Synopsis +-------- +'pacdiff' [options] + + +Description +----------- +pacdiff is a script which looks for pacorig, pacnew and pacsave files from the +backup entries found in the local Pacman db. For every found file the option is +given to view, skip, diff, remove or overwrite the found pacorig, pacnew or +pacsave file. + +Environment +----------- +*DIFFPROG*:: + Override the default 'vim -d' merge program. + +*DIFFSEARCHPATH*:: + Override the default search path '/etc', only when using find. + + +Options +------- +*-l, \--locate*:: + Select one (default: \--pacmandb). + +*-f, \--find*:: + Scan using locate. + +*-p, \--pacmandb*:: + Scan active config files from Pacman database. + +*-o, \--output*:: + Print files instead of merging them. + +*\--nocolor*:: + Remove colors from output. + + +See Also +-------- +linkman:pacman[8], linkman:pacman.conf[5] + +include::footer.txt[]