Skip to content

Commit

Permalink
Get FAQ more in sync with the other manuals.
Browse files Browse the repository at this point in the history
git-svn-id: https://svn.r-project.org/R/trunk@84879 00db46b3-68df-0310-9c12-caf00c1e9a41
  • Loading branch information
hornik committed Aug 6, 2023
1 parent 6f5b912 commit fafc33a
Show file tree
Hide file tree
Showing 3 changed files with 22 additions and 52 deletions.
4 changes: 3 additions & 1 deletion doc/manual/Makefile.in
Original file line number Diff line number Diff line change
Expand Up @@ -207,6 +207,8 @@ version.texi: Makefile $(top_srcdir)/VERSION $(SVN_REV)
$(ECHO) "@set VERSIONno $${v}" > $@; \
v="$${vv} (`sed -e 1d -e 's/^Last Changed Date: //' $(SVN_REV)`)"; \
$(ECHO) "@set VERSION $${v}" >> $@; \
v=`sed -e 1d -e 's/.*: *\([^-]*\)-.*/\1/' $(SVN_REV)`; \
$(ECHO) "@set FAQ_YEAR $${v}" >> $@; \
rwv=`$(R_EXE) -f $(top_srcdir)/src/gnuwin32/fixed/rwver.R`; \
$(ECHO) "@set RWVERSION $${rwv}" >> $@ )
@if test "$(R_PAPERSIZE)" = "a4"; then \
Expand All @@ -222,7 +224,7 @@ R-exts.html: $(texiincludes) $(srcdir)/Rman.css $(srcdir)/texi2html.sh
R-intro.html: stamp-images-html $(texiincludes) $(srcdir)/Rman.css $(srcdir)/texi2html.sh
R-ints.html: $(texiincludes) $(srcdir)/Rman.css $(srcdir)/texi2html.sh
R-lang.html: $(texiincludes) $(srcdir)/Rman.css $(srcdir)/texi2html.sh
R-FAQ.html: $(srcdir)/Rman.css $(srcdir)/texi2html.sh
R-FAQ.html: $(texiincludes) $(srcdir)/Rman.css $(srcdir)/texi2html.sh

ebooks: epub mobi
epub: $(OBJECTS_EPUB)
Expand Down
2 changes: 2 additions & 0 deletions doc/manual/Makefile.win
Original file line number Diff line number Diff line change
Expand Up @@ -169,6 +169,8 @@ version.texi: Makefile.win $(top_srcdir)/VERSION $(SVN_REV)
$(ECHO) "@set VERSIONno $${v}" > $@; \
v="$${vv} (`sed -e 1d -e 's/^Last Changed Date: //' $(SVN_REV)`)"; \
$(ECHO) "@set VERSION $${v}" >> $@; \
v=`sed -e 1d -e 's/.*: *\([^-]*\)-.*/\1/' $(SVN_REV)`; \
$(ECHO) "@set FAQ_YEAR $${v}" >> $@; \
rwv=$(shell ../../bin$(R_ARCH)/Rscript ../../src/gnuwin32/fixed/rwver.R); \
$(ECHO) "@set RWVERSION $${rwv}" >> $@ )
@if test "$(R_PAPERSIZE)" = "a4"; then \
Expand Down
68 changes: 17 additions & 51 deletions doc/manual/R-FAQ.texi
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,6 @@
@setfilename R-FAQ.info
@settitle R FAQ
@setchapternewpage on
@set FAQ_YEAR 2023
@set FAQ_DATE @value{FAQ_YEAR}-04-05
@set FAQ_VERSION @value{FAQ_DATE}
@documentlanguage en
@documentencoding UTF-8
@c %**end of header
Expand All @@ -19,6 +16,7 @@
@finalout

@include R-defs.texi
@include version.texi

@macro CRAN{}
@acronym{CRAN}
Expand All @@ -43,7 +41,6 @@ doi:@tie{}@url{https://doi.org/\d\, \d\}
@titlepage
@title R @acronym{FAQ}
@subtitle Frequently Asked Questions on R
@subtitle Version @value{FAQ_VERSION}
@author Kurt Hornik
@author and the R Core Team
@end titlepage
Expand All @@ -52,7 +49,6 @@ doi:@tie{}@url{https://doi.org/\d\, \d\}
@c We do not really see this in info, but in plain text output.
R FAQ @*
Frequently Asked Questions on R @*
Version @value{FAQ_VERSION} @*
Kurt Hornik and the R Core Team @*

@sp 2
Expand All @@ -65,14 +61,16 @@ Kurt Hornik and the R Core Team @*
@ifnottex
@node Top, Introduction, (dir), (dir)
@top R FAQ
@ifhtml
@html
<h2>Frequently Asked Questions on R</h2>
<h3 style="text-align: center;">Version @value{FAQ_VERSION}</h3>
<h3 style="text-align: center;">Kurt Hornik and the R Core Team</h3>
<hr/>
@end html
@end ifhtml
@c @ifhtml
@c @html
@c <h2>Frequently Asked Questions on R</h2>
@c <h3 style="text-align: center;">Kurt Hornik and the R Core Team</h3>
@c <hr/>
@c @end html
@c @end ifhtml

This document contains answers to some of the most frequently asked
questions about R.
@end ifnottex

@menu
Expand All @@ -91,9 +89,6 @@ Kurt Hornik and the R Core Team @*
@node Introduction, R Basics, Top, Top
@chapter Introduction

This document contains answers to some of the most frequently asked
questions about R.

@menu
* Legalese::
* Obtaining this document::
Expand Down Expand Up @@ -137,7 +132,7 @@ The latest version of this document is always available from

From there, you can obtain versions converted to
@url{https://CRAN.R-project.org/doc/manuals/R-FAQ.html,, @HTML{}} and
@url{https://CRAN.R-project.org/doc/manuals/R-FAQ.pdf,, PDF},
@url{https://CRAN.R-project.org/doc/manuals/R-FAQ.pdf,, PDF}.

@node Citing this document, Notation, Obtaining this document, Introduction
@section Citing this document
Expand Down Expand Up @@ -465,43 +460,12 @@ Apple installer packages at @uref{https://mac.R-project.org}.
@node Are there Unix-like binaries for R?, What documentation exists for R?, How can R be installed?, R Basics
@section Are there Unix-like binaries for R?

@c Linux binaries as of 2014-07-27:
@c Providers:
@c Debian: Johannes Ranke <[email protected]>
@c Ubuntu: Michael Rutter <[email protected]>
@c
@c debian
@c current:
@c wheezy-cran3 i386/amd64/armel 3.1.1
@c squeeze-cran3 i386/amd64 3.1.1
@c archive:
@c squeeze-cran i386/amd64 2.15.3
@c lenny-cran i386/amd64 2.14.1
@c etch-cran i386/amd64 2.11.0
@c
@c ubuntu
@c Trusty Tahr (14.04)
@c Saucy Salamander (13.10)
@c Quantal Quetzal (12.10)
@c Precise Pangolin (12.04; LTS)
@c Lucid Lynx (10.04; LTS)

Binary distributions of R are available on many Unix-like OSes: only
some can be mentioned here so check your OS's search facilities to see
if one is available for yours.

The @file{bin/linux} directory of a @CRAN{} site contains the following
packages.

@need 1000
@quotation
@multitable {Red Hat} {i386/x86_64} {lucid/precise/trusty} {Martyn Plummer}
@headitem @tab CPU @tab Versions @tab Provider
@item Debian @tab i386/amd64 @tab squeeze/wheezy @tab Johannes Ranke
@item @tab armel @tab wheezy @tab Johannes Ranke
@item Ubuntu @tab i386/amd64 @tab lucid/precise/trusty @tab Michael Rutter
@end multitable
@end quotation
The @file{bin/linux} directory of a @CRAN{} site contains R packages for
Debian and Ubuntu.

Debian packages, maintained by Dirk Eddelbuettel, have long been part of
the Debian distribution, and can be accessed through APT, the Debian
Expand All @@ -515,7 +479,9 @@ available from @CRAN{}. See
@url{https://CRAN.R-project.org/bin/linux/debian/index.html} for details on R
Debian packages and installing the backports, which should also be
suitable for other Debian derivatives. Native backports for Ubuntu are
provided by Michael Rutter.
provided by Michael Rutter, see
@url{https://CRAN.R-project.org/bin/linux/ubuntu/index.html} for
instructions.

R binaries for Fedora, maintained by Tom ``Spot'' Callaway, are provided
as part of the Fedora distribution and can be accessed through
Expand Down

0 comments on commit fafc33a

Please sign in to comment.