diff options
| author | TheDmitry <TheDmitry@users.noreply.github.com> | 2015-01-31 21:33:57 +0300 |
|---|---|---|
| committer | TheDmitry <TheDmitry@users.noreply.github.com> | 2015-01-31 21:33:57 +0300 |
| commit | 955e5faf4a0084749d2d590fd5ee6de2d2c8ea69 (patch) | |
| tree | f3d7eb8bc13f0e2837a439556699d1306ae85609 | |
| parent | e4e96d25b5dd54525534c653599886a584091015 (diff) | |
| parent | bfac539c9fe8aaf50e26fb4a97b24ad805ac293d (diff) | |
Merge remote-tracking branch 'upstream/master' into json-ru
| -rw-r--r-- | c.html.markdown | 2 | ||||
| -rw-r--r-- | r.html.markdown | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/c.html.markdown b/c.html.markdown index 7670824a..1696d28f 100644 --- a/c.html.markdown +++ b/c.html.markdown @@ -85,7 +85,7 @@ int main() { // doubles are usually 64-bit floating-point numbers double x_double = 0.0; // real numbers without any suffix are doubles - // integer types may be unsigned (only positive) + // integer types may be unsigned (greater than or equal to zero) unsigned short ux_short; unsigned int ux_int; unsigned long long ux_long_long; diff --git a/r.html.markdown b/r.html.markdown index 447db4b3..d3d725d3 100644 --- a/r.html.markdown +++ b/r.html.markdown @@ -259,6 +259,7 @@ levels(infert$education) # "0-5yrs" "6-11yrs" "12+ yrs" # NULL # "NULL" is a weird one; use it to "blank out" a vector class(NULL) # NULL +parakeet = c("beak", "feathers", "wings", "eyes") parakeet # => # [1] "beak" "feathers" "wings" "eyes" |