aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard M. Stallman2006-07-29 22:09:15 +0000
committerRichard M. Stallman2006-07-29 22:09:15 +0000
commit6d3361b9d5b80acc5741e80a24452937afdda7fa (patch)
tree757f5e592e11c24bc97f1bee9de7b4998319b0f5
parent4f213bd48da55b1be08892b3c77a705b2a122546 (diff)
downloademacs-6d3361b9d5b80acc5741e80a24452937afdda7fa.tar.gz
emacs-6d3361b9d5b80acc5741e80a24452937afdda7fa.zip
(Operating on Files): Simplify previous change and fix Texinfo usage.
-rw-r--r--man/ChangeLog5
-rw-r--r--man/dired.texi36
2 files changed, 23 insertions, 18 deletions
diff --git a/man/ChangeLog b/man/ChangeLog
index efaa6ae4755..acf86b84160 100644
--- a/man/ChangeLog
+++ b/man/ChangeLog
@@ -1,3 +1,8 @@
12006-07-29 Richard Stallman <rms@gnu.org>
2
3 * dired.texi (Operating on Files): Simplify previous change
4 and fix Texinfo usage.
5
12006-07-29 Eli Zaretskii <eliz@gnu.org> 62006-07-29 Eli Zaretskii <eliz@gnu.org>
2 7
3 * dired.texi (Operating on Files): Add cross-references. State the 8 * dired.texi (Operating on Files): Add cross-references. State the
diff --git a/man/dired.texi b/man/dired.texi
index 02950035515..3bb32c1ac74 100644
--- a/man/dired.texi
+++ b/man/dired.texi
@@ -550,26 +550,27 @@ next window, that other buffer's directory is suggested instead.
550@item C @var{new} @key{RET} 550@item C @var{new} @key{RET}
551Copy the specified files (@code{dired-do-copy}). The argument @var{new} 551Copy the specified files (@code{dired-do-copy}). The argument @var{new}
552is the directory to copy into, or (if copying a single file) the new 552is the directory to copy into, or (if copying a single file) the new
553name. This is similar to what the Unix @code{cp} command does. 553name. This is like the shell command @code{cp}.
554 554
555@vindex dired-copy-preserve-time 555@vindex dired-copy-preserve-time
556If @code{dired-copy-preserve-time} is non-@code{nil}, then copying 556If @code{dired-copy-preserve-time} is non-@code{nil}, then copying
557with this command preserves the modification time of the old file in 557with this command preserves the modification time of the old file in
558the copy, similarly to @kbd{cp -p}. 558the copy, like @samp{cp -p}.
559 559
560@vindex dired-recursive-copies 560@vindex dired-recursive-copies
561@cindex recursive copying 561@cindex recursive copying
562The variable @code{dired-recursive-copies} controls whether to copy 562The variable @code{dired-recursive-copies} controls whether to copy
563directories recursively (a-la @kbd{cp -r}). The default is 563directories recursively (like @samp{cp -r}). The default is
564@code{nil}, which means that directories cannot be copied. 564@code{nil}, which means that directories cannot be copied.
565 565
566@item D 566@item D
567@findex dired-do-delete 567@findex dired-do-delete
568@kindex D @r{(Dired)} 568@kindex D @r{(Dired)}
569Delete the specified files (@code{dired-do-delete}). This is similar 569Delete the specified files (@code{dired-do-delete}). This is like the
570to what the Unix @code{rm} command does. Like the other commands in 570shell command @code{rm}.
571this section, this command operates on the @emph{marked} files, or the 571
572next @var{n} files. By contrast, @kbd{x} 572Like the other commands in this section, this command operates on the
573@emph{marked} files, or the next @var{n} files. By contrast, @kbd{x}
573(@code{dired-do-flagged-delete}) deletes all @dfn{flagged} files. 574(@code{dired-do-flagged-delete}) deletes all @dfn{flagged} files.
574 575
575@findex dired-do-rename 576@findex dired-do-rename
@@ -580,8 +581,7 @@ next @var{n} files. By contrast, @kbd{x}
580Rename the specified files (@code{dired-do-rename}). If you rename a 581Rename the specified files (@code{dired-do-rename}). If you rename a
581single file, the argument @var{new} is the new name of the file. If 582single file, the argument @var{new} is the new name of the file. If
582you rename several files, the argument @var{new} is the directory into 583you rename several files, the argument @var{new} is the directory into
583which to move the files (this is similar to what the Unix @code{mv} 584which to move the files (this is like the shell command @code{mv}).
584command does).
585 585
586Dired automatically changes the visited file name of buffers associated 586Dired automatically changes the visited file name of buffers associated
587with renamed files so that they refer to the new names. 587with renamed files so that they refer to the new names.
@@ -591,18 +591,18 @@ with renamed files so that they refer to the new names.
591@cindex hard links (in Dired) 591@cindex hard links (in Dired)
592@item H @var{new} @key{RET} 592@item H @var{new} @key{RET}
593Make hard links to the specified files (@code{dired-do-hardlink}). 593Make hard links to the specified files (@code{dired-do-hardlink}).
594This is similar to what the Unix @code{ln} command does. The argument 594This is like the shell command @code{ln}. The argument @var{new} is
595@var{new} is the directory to make the links in, or (if making just 595the directory to make the links in, or (if making just one link) the
596one link) the name to give the link. 596name to give the link.
597 597
598@findex dired-do-symlink 598@findex dired-do-symlink
599@kindex S @r{(Dired)} 599@kindex S @r{(Dired)}
600@cindex symbolic links (creation in Dired) 600@cindex symbolic links (creation in Dired)
601@item S @var{new} @key{RET} 601@item S @var{new} @key{RET}
602Make symbolic links to the specified files (@code{dired-do-symlink}) 602Make symbolic links to the specified files (@code{dired-do-symlink}).
603(this is similar to what @kbd{ln -s} does on Unix). The argument 603This is like @samp{ln -s}. The argument @var{new} is the directory to
604@var{new} is the directory to make the links in, or (if making just 604make the links in, or (if making just one link) the name to give the
605one link) the name to give the link. 605link.
606 606
607@findex dired-do-chmod 607@findex dired-do-chmod
608@kindex M @r{(Dired)} 608@kindex M @r{(Dired)}
@@ -637,8 +637,8 @@ different places).
637@cindex changing file time (in Dired) 637@cindex changing file time (in Dired)
638@item T @var{timestamp} @key{RET} 638@item T @var{timestamp} @key{RET}
639Touch the specified files (@code{dired-do-touch}). This means 639Touch the specified files (@code{dired-do-touch}). This means
640updating their modification times to the present time. This is 640updating their modification times to the present time. This is like
641similar to what the Unix @code{touch} command does. 641the shell command @code{touch}.
642 642
643@findex dired-do-print 643@findex dired-do-print
644@kindex P @r{(Dired)} 644@kindex P @r{(Dired)}