Skip to content

Commit 7b80b5e

Browse files
author
smeyer
committed
tweak comments
git-svn-id: https://svn.r-project.org/R/trunk@87272 00db46b3-68df-0310-9c12-caf00c1e9a41
1 parent 023cdb5 commit 7b80b5e

File tree

2 files changed

+10
-14
lines changed

2 files changed

+10
-14
lines changed

src/library/base/man/Deprecated.Rd

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,17 +27,17 @@
2727
}
2828
\item{msg}{
2929
character string: A message to be printed, if missing a default
30-
message is used.}
30+
message is used.
31+
}
3132
\item{old}{character string specifying the function (default) or usage
3233
which is being deprecated.}
3334
}
3435
\details{
35-
\code{.Deprecated("\var{new name}")} is called from deprecated
36-
functions. The original help page for these functions is often
37-
available at \code{help("\var{old}-deprecated")} (note the quotes).
38-
% FIXME: the above is not true any more; the old \alias is usually kept as-is.
39-
Deprecated functions should be listed in \code{help("\var{pkg}-deprecated")}
36+
\code{.Deprecated("\var{new name}")} is called from deprecated functions.
37+
These should be listed in \code{help("\var{pkg}-deprecated")}
4038
for an appropriate \var{pkg}, including \pkg{base}.
39+
The original help page for a deprecated function is sometimes
40+
available at \code{help("\var{old}-deprecated")} (note the quotes).
4141

4242
\code{.Deprecated} signals a warning of class \code{"deprecatedWarning"}
4343
with fields \code{old}, \code{new}, and \code{package}.

src/library/tools/R/QC.R

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1526,13 +1526,10 @@ function(package, dir, lib.loc = NULL, chkInternal = NULL)
15261526
}
15271527

15281528
## Also test whether the objects we found from the \usage all
1529-
## have aliases, provided that there is no alias which ends in
1530-
## '-deprecated' (see e.g. base-deprecated.Rd).
1531-
## <FIXME>
1532-
## Why are we making the '-deprecated' exception?
1533-
## Surely there should be aliases for such functions, and the
1534-
## deprecated-Rd files in the base packages even say
1535-
## %------ PLEASE: put \alias{.} here for EACH !
1529+
## have aliases, provided no alias ends in '-deprecated'.
1530+
## This exception allows packages to keep the original help page of a
1531+
## deprecated function at help("<fun>-deprecated") (see ?deprecated)
1532+
## and alias <fun> to help("<pkg>-deprecated").
15361533
functions_not_in_aliases <-
15371534
if(!any(endsWith(aliases, "-deprecated"))) {
15381535
## Argh. There are good reasons for keeping \S4method{}{}
@@ -1549,7 +1546,6 @@ function(package, dir, lib.loc = NULL, chkInternal = NULL)
15491546
setdiff(functions, aliases)
15501547
}
15511548
else character()
1552-
## </FIXME>
15531549

15541550
if((length(arg_names_in_usage_missing_in_arg_list))
15551551
|| anyDuplicated(arg_names_in_arg_list)

0 commit comments

Comments
 (0)