Prva inačica za bullseye

[carnet-tools-cn.git] / cp-update.1

diff --git a/cp-update.1 b/cp-update.1
index f36368d..1332c2e 100644 (file)
--- a/cp-update.1
+++ b/cp-update.1
@@ -1,5 +1,5 @@
 .\" Copied from from Pod::Man template\r
-.\" Wed, 23 Mar 2005 11:51:08 +0100\r
+.\" Wed, 14 Mar 2006 21:15:00 +0100\r
 .\"\r
 .\" Standard preamble:\r
 .\" ======================================================================\r
@@ -38,7 +38,7 @@
 .if n .na\r
 .\"
 .IX Title "cp-update 1"
-.TH cp-update 1 "March 2005" CARNet "CARNet Packaging Tools"
+.TH cp-update 1 "March 2006" CARNet "CARNet Packaging Tools"
 .SH NAME\r
 cp-update \- versatile line-based file updating tool\r
 .\"
@@ -81,15 +81,15 @@ block marking and file handling.
 Remove entry \fIpackage\fR from \fIfile\fR. Default is to add lines \r
 from stdin.\r
 .TP\r
+\fB\-x\fR | \fB\-\-change\fR\r
+Modify existing block, or add it if it does not exist but the begin \r
+mark can be found. Does basically the same as regular insert without\r
+\-\-allow\-multiple but on other way (in-place). Thus those two options\r
+are mutually exclusive.\r
+.TP\r
 \fB\-m\fR | \fB\-\-allow\-multiple\fR\r
 Allow multiple blocks of the same type. By default, old blocks are \r
 replaced with the new one.\r
-.TP\r
-\fB\-h\fR | \fB\-\-help\fR\r
-Print usage reference and exit.\r
-.TP\r
-     \fB\-\-version\fR
-Print title, version, copyright message, and exit.\r
 .SS Placement control\r
 .TP\r
 \fB\-t\fR | \fB\-\-insert\-on\-top\fR\r
@@ -100,9 +100,8 @@ Insert after the first line that matches given pattern.
 .TP\r
 \fB\-f\fR | \fB\-\-insert\-before\fR \fIpattern\fR\r
 Insert before the first line that matches given pattern.\r
-.TP\r
-\fB\-R\fR | \fB\-\-regexp\-match\fR | \fB\-\-regexp\fR\r
-Use regexp mode for line matching.\r
+.PP\r
+Line-matching patterns are PCREs (Perl-compatible regular expressions).\r
 .SS Manipulating block marks\r
 .TP\r
 \fB\-c\fR | \fB\-\-comment\fR \fIstring\fR\r
@@ -140,6 +139,13 @@ anew and replaces the old by renaming it to target name.
 \fB\-n\fR | \fB\-\-no\-close\fR\r
 Do not close and reopen file when editing it in place.\r
 Slightly optimized version of the above.\r
+.SS Support modes\r
+.TP\r
+\fB\-h\fR | \fB\-\-help\fR\r
+Print usage reference and exit.\r
+.TP\r
+     \fB\-\-version\fR
+Print title, version, copyright message, and exit.\r
 .\"
 .SH "EXIT STATUS"
 Upon successful execution of given operation, program returns 
@@ -167,7 +173,7 @@ the inserted block between customized markers):
 .RS
 .Sp
 .Vb 4\r
-\&    cp-update --regexp --insert-before '</Controls>'      \\\r
+\&    cp-update --insert-before '</Controls>'               \\\r
 \&              --comment '<!--' --comment-end ' -->'       \\\r
 \&              gentoo-cn /etc/gentoorc < gentoo-cn.ins
 .Ve\r
@@ -177,9 +183,9 @@ the same markers as we did when the block was inserted):
 .RS
 .Sp
 .Vb 4\r
-\&    cp-update -r --regexp --insert-before '</Controls>'   \\\r
-\&              --comment '<!--' --comment-end ' -->'       \\\r
-\&              gentoo-cn /etc/gentoorc
+\&    cp-update -r --insert-before '</Controls>'            \\\r
+\&                 --comment '<!--' --comment-end ' -->'    \\\r
+\&                 gentoo-cn /etc/gentoorc
 .Ve\r
 .RE\r
 .\"
@@ -203,13 +209,12 @@ For precise insight in its operation don't hesitate to look at the source.
 .\"
 .SH "REPORTING BUGS"
 If you find any, we encourage you to send them to CARNet packaging group\r
-at SRCE <paketi@srce.hr>.
+<paketi-team@CARNet.hr>.
 .PP
 When sending bug reports, please try to run program in diagnostic mode
 and try to send us quality feedback so we could easily locate and
 correct the problem.\r
 .\"
 .SH "SEE ALSO"\r
-.BR carnet-tools(8),\r
-.BR dpkg-divert(8).
+\fBcarnet-tools\fR(7).\r
 .\" End