Index: stable/12/lib/libc/stdio/getwc.3 =================================================================== --- stable/12/lib/libc/stdio/getwc.3 (revision 363762) +++ stable/12/lib/libc/stdio/getwc.3 (revision 363763) @@ -1,114 +1,121 @@ .\" $NetBSD: getwc.3,v 1.3 2002/02/07 07:00:26 ross Exp $ .\" .\" Copyright (c) 1990, 1991, 1993 .\" The Regents of the University of California. All rights reserved. .\" .\" This code is derived from software contributed to Berkeley by .\" Chris Torek and the American National Standards Committee X3, .\" on Information Processing Systems. .\" .\" Redistribution and use in source and binary forms, with or without .\" modification, are permitted provided that the following conditions .\" are met: .\" 1. Redistributions of source code must retain the above copyright .\" notice, this list of conditions and the following disclaimer. .\" 2. Redistributions in binary form must reproduce the above copyright .\" notice, this list of conditions and the following disclaimer in the .\" documentation and/or other materials provided with the distribution. .\" 3. Neither the name of the University nor the names of its contributors .\" may be used to endorse or promote products derived from this software .\" without specific prior written permission. .\" .\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND .\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE .\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE .\" ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE .\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL .\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS .\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) .\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT .\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" .\" @(#)getc.3 8.1 (Berkeley) 6/4/93 .\" $FreeBSD$ .\" .Dd March 3, 2004 .Dt GETWC 3 .Os .Sh NAME .Nm fgetwc , .Nm getwc , .Nm getwchar .Nd get next wide character from input stream .Sh LIBRARY .Lb libc .Sh SYNOPSIS .In stdio.h .In wchar.h .Ft wint_t .Fn fgetwc "FILE *stream" .Ft wint_t .Fn getwc "FILE *stream" .Ft wint_t .Fn getwchar void .Sh DESCRIPTION The .Fn fgetwc function obtains the next input wide character (if present) from the stream pointed at by .Fa stream , or the next character pushed back on the stream via .Xr ungetwc 3 . .Pp The .Fn getwc function acts essentially identically to .Fn fgetwc . .Pp The .Fn getwchar function is equivalent to .Fn getwc with the argument .Dv stdin . .Sh RETURN VALUES If successful, these routines return the next wide character from the .Fa stream . If the stream is at end-of-file or a read error occurs, the routines return .Dv WEOF . The routines .Xr feof 3 and .Xr ferror 3 must be used to distinguish between end-of-file and error. If an error occurs, the global variable .Va errno is set to indicate the error. The end-of-file condition is remembered, even on a terminal, and all subsequent attempts to read will return .Dv WEOF until the condition is cleared with .Xr clearerr 3 . .Sh SEE ALSO .Xr ferror 3 , .Xr fopen 3 , .Xr fread 3 , .Xr getc 3 , .Xr putwc 3 , .Xr stdio 3 , .Xr ungetwc 3 .Sh STANDARDS The .Fn fgetwc , .Fn getwc and .Fn getwchar functions conform to .St -isoC-99 . +.Sh HISTORY +A version of the +.Fn getc +and +.Fn getw +functions appeared in +.At v1 . Index: stable/12/lib/libc/stdlib/atof.3 =================================================================== --- stable/12/lib/libc/stdlib/atof.3 (revision 363762) +++ stable/12/lib/libc/stdlib/atof.3 (revision 363763) @@ -1,95 +1,100 @@ .\" Copyright (c) 1991, 1993 .\" The Regents of the University of California. All rights reserved. .\" .\" This code is derived from software contributed to Berkeley by .\" the American National Standards Committee X3, on Information .\" Processing Systems. .\" .\" Redistribution and use in source and binary forms, with or without .\" modification, are permitted provided that the following conditions .\" are met: .\" 1. Redistributions of source code must retain the above copyright .\" notice, this list of conditions and the following disclaimer. .\" 2. Redistributions in binary form must reproduce the above copyright .\" notice, this list of conditions and the following disclaimer in the .\" documentation and/or other materials provided with the distribution. .\" 3. Neither the name of the University nor the names of its contributors .\" may be used to endorse or promote products derived from this software .\" without specific prior written permission. .\" .\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND .\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE .\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE .\" ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE .\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL .\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS .\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) .\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT .\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" .\" @(#)atof.3 8.1 (Berkeley) 6/4/93 .\" $FreeBSD$ .\" -.Dd June 4, 1993 +.Dd April 1, 2020 .Dt ATOF 3 .Os .Sh NAME .Nm atof .Nd convert .Tn ASCII string to double .Sh LIBRARY .Lb libc .Sh SYNOPSIS .In stdlib.h .Ft double .Fn atof "const char *nptr" .Sh DESCRIPTION The .Fn atof function converts the initial portion of the string pointed to by .Fa nptr to .Vt double representation. .Pp It is equivalent to: .Bd -literal -offset indent strtod(nptr, (char **)NULL); .Ed .Pp The decimal point character is defined in the program's locale (category .Dv LC_NUMERIC ) . .Sh IMPLEMENTATION NOTES The .Fn atof function is not thread-safe and also not async-cancel-safe. .Pp The .Fn atof function has been deprecated by .Fn strtod and should not be used in new code. .Sh ERRORS The function .Fn atof need not affect the value of .Va errno on an error. .Sh SEE ALSO .Xr atoi 3 , .Xr atol 3 , .Xr strtod 3 , .Xr strtol 3 , .Xr strtoul 3 .Sh STANDARDS The .Fn atof function conforms to .St -p1003.1-90 , .St -isoC , and .St -isoC-99 . +.Sh HISTORY +The +.Fn atof +function appeared in +.At v1 . Index: stable/12/lib/libc/stdlib/atoi.3 =================================================================== --- stable/12/lib/libc/stdlib/atoi.3 (revision 363762) +++ stable/12/lib/libc/stdlib/atoi.3 (revision 363763) @@ -1,87 +1,92 @@ .\" Copyright (c) 1990, 1991, 1993 .\" The Regents of the University of California. All rights reserved. .\" .\" This code is derived from software contributed to Berkeley by .\" the American National Standards Committee X3, on Information .\" Processing Systems. .\" .\" Redistribution and use in source and binary forms, with or without .\" modification, are permitted provided that the following conditions .\" are met: .\" 1. Redistributions of source code must retain the above copyright .\" notice, this list of conditions and the following disclaimer. .\" 2. Redistributions in binary form must reproduce the above copyright .\" notice, this list of conditions and the following disclaimer in the .\" documentation and/or other materials provided with the distribution. .\" 3. Neither the name of the University nor the names of its contributors .\" may be used to endorse or promote products derived from this software .\" without specific prior written permission. .\" .\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND .\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE .\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE .\" ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE .\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL .\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS .\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) .\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT .\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" .\" @(#)atoi.3 8.1 (Berkeley) 6/4/93 .\" $FreeBSD$ .\" -.Dd June 13, 2018 +.Dd April 1, 2020 .Dt ATOI 3 .Os .Sh NAME .Nm atoi .Nd convert .Tn ASCII string to integer .Sh LIBRARY .Lb libc .Sh SYNOPSIS .In stdlib.h .Ft int .Fn atoi "const char *nptr" .Sh DESCRIPTION The .Fn atoi function converts the initial portion of the string pointed to by .Fa nptr to .Vt int representation. .Pp It is equivalent to: .Bd -literal -offset indent (int)strtol(nptr, NULL, 10); .Ed .Pp The .Fn atoi function has been deprecated by .Fn strtol and should not be used in new code. .Sh ERRORS The function .Fn atoi need not affect the value of .Va errno on an error. .Sh SEE ALSO .Xr atof 3 , .Xr atol 3 , .Xr strtod 3 , .Xr strtol 3 , .Xr strtoul 3 .Sh STANDARDS The .Fn atoi function conforms to .St -p1003.1-90 , .St -isoC , and .St -isoC-99 . +.Sh HISTORY +The +.Fn atoi +function appeared in +.At v1 . Index: stable/12/lib/msun/man/cos.3 =================================================================== --- stable/12/lib/msun/man/cos.3 (revision 363762) +++ stable/12/lib/msun/man/cos.3 (revision 363763) @@ -1,83 +1,88 @@ .\" Copyright (c) 1991 The Regents of the University of California. .\" All rights reserved. .\" .\" Redistribution and use in source and binary forms, with or without .\" modification, are permitted provided that the following conditions .\" are met: .\" 1. Redistributions of source code must retain the above copyright .\" notice, this list of conditions and the following disclaimer. .\" 2. Redistributions in binary form must reproduce the above copyright .\" notice, this list of conditions and the following disclaimer in the .\" documentation and/or other materials provided with the distribution. .\" 3. Neither the name of the University nor the names of its contributors .\" may be used to endorse or promote products derived from this software .\" without specific prior written permission. .\" .\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND .\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE .\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE .\" ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE .\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL .\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS .\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) .\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT .\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" .\" from: @(#)cos.3 5.1 (Berkeley) 5/2/91 .\" $FreeBSD$ .\" -.Dd January 24, 2008 +.Dd April 1, 2020 .Dt COS 3 .Os .Sh NAME .Nm cos , .Nm cosf , .Nm cosl .Nd cosine functions .Sh LIBRARY .Lb libm .Sh SYNOPSIS .In math.h .Ft double .Fn cos "double x" .Ft float .Fn cosf "float x" .Ft long double .Fn cosl "long double x" .Sh DESCRIPTION The .Fn cos , .Fn cosf , and .Fn cosl functions compute the cosine of .Fa x (measured in radians). A large magnitude argument may yield a result with little or no significance. For a discussion of error due to roundoff, see .Xr math 3 . .Sh RETURN VALUES The .Fn cos , .Fn cosf , and .Fn cosl functions return the cosine value. .Sh SEE ALSO .Xr acos 3 , .Xr asin 3 , .Xr atan 3 , .Xr atan2 3 , .Xr ccos 3 , .Xr cosh 3 , .Xr math 3 , .Xr sin 3 , .Xr sinh 3 , .Xr tan 3 , .Xr tanh 3 .Sh STANDARDS These functions conform to .St -isoC-99 . +.Sh HISTORY +The +.Fn cos +function first appeared in +.At v1 . Index: stable/12/lib/msun/man/exp.3 =================================================================== --- stable/12/lib/msun/man/exp.3 (revision 363762) +++ stable/12/lib/msun/man/exp.3 (revision 363763) @@ -1,192 +1,197 @@ .\" Copyright (c) 1985, 1991 Regents of the University of California. .\" All rights reserved. .\" .\" Redistribution and use in source and binary forms, with or without .\" modification, are permitted provided that the following conditions .\" are met: .\" 1. Redistributions of source code must retain the above copyright .\" notice, this list of conditions and the following disclaimer. .\" 2. Redistributions in binary form must reproduce the above copyright .\" notice, this list of conditions and the following disclaimer in the .\" documentation and/or other materials provided with the distribution. .\" 3. Neither the name of the University nor the names of its contributors .\" may be used to endorse or promote products derived from this software .\" without specific prior written permission. .\" .\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND .\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE .\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE .\" ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE .\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL .\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS .\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) .\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT .\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" .\" from: @(#)exp.3 6.12 (Berkeley) 7/31/91 .\" $FreeBSD$ .\" -.Dd December 8, 2017 +.Dd April 1, 2020 .Dt EXP 3 .Os .Sh NAME .Nm exp , .Nm expf , .Nm expl , .\" The sorting error is intentional. exp, expf, and expl should be adjacent. .Nm exp2 , .Nm exp2f , .Nm exp2l , .Nm expm1 , .Nm expm1f , .Nm expm1l , .Nm pow , .Nm powf , .Nm powl .Nd exponential and power functions .Sh LIBRARY .Lb libm .Sh SYNOPSIS .In math.h .Ft double .Fn exp "double x" .Ft float .Fn expf "float x" .Ft long double .Fn expl "long double x" .Ft double .Fn exp2 "double x" .Ft float .Fn exp2f "float x" .Ft long double .Fn exp2l "long double x" .Ft double .Fn expm1 "double x" .Ft float .Fn expm1f "float x" .Ft long double .Fn expm1l "long double x" .Ft double .Fn pow "double x" "double y" .Ft float .Fn powf "float x" "float y" .Ft long double .Fn powl "long double x" "long double y" .Sh DESCRIPTION The .Fn exp , .Fn expf , and .Fn expl functions compute the base .Ms e exponential value of the given argument .Fa x . .Pp The .Fn exp2 , .Fn exp2f , and .Fn exp2l functions compute the base 2 exponential of the given argument .Fa x . .Pp The .Fn expm1 , .Fn expm1f , and the .Fn expm1l functions compute the value exp(x)\-1 accurately even for tiny argument .Fa x . .Pp The .Fn pow , .Fn powf , and the .Fn powl functions compute the value of .Ar x to the exponent .Ar y . .Sh ERROR (due to Roundoff etc.) The values of .Fn exp 0 , .Fn expm1 0 , .Fn exp2 integer , and .Fn pow integer integer are exact provided that they are representable. .\" XXX Is this really true for pow()? Otherwise the error in these functions is generally below one .Em ulp . .Sh RETURN VALUES These functions will return the appropriate computation unless an error occurs or an argument is out of range. The functions .Fn pow x y , .Fn powf x y , and .Fn powl x y raise an invalid exception and return an \*(Na if .Fa x < 0 and .Fa y is not an integer. .Sh NOTES The function .Fn pow x 0 returns x**0 = 1 for all x including x = 0, \*(If, and \*(Na . Previous implementations of pow may have defined x**0 to be undefined in some or all of these cases. Here are reasons for returning x**0 = 1 always: .Bl -enum -width indent .It Any program that already tests whether x is zero (or infinite or \*(Na) before computing x**0 cannot care whether 0**0 = 1 or not. Any program that depends upon 0**0 to be invalid is dubious anyway since that expression's meaning and, if invalid, its consequences vary from one computer system to another. .It Some Algebra texts (e.g.\& Sigler's) define x**0 = 1 for all x, including x = 0. This is compatible with the convention that accepts a[0] as the value of polynomial .Bd -literal -offset indent p(x) = a[0]\(**x**0 + a[1]\(**x**1 + a[2]\(**x**2 +...+ a[n]\(**x**n .Ed .Pp at x = 0 rather than reject a[0]\(**0**0 as invalid. .It Analysts will accept 0**0 = 1 despite that x**y can approach anything or nothing as x and y approach 0 independently. The reason for setting 0**0 = 1 anyway is this: .Bd -ragged -offset indent If x(z) and y(z) are .Em any functions analytic (expandable in power series) in z around z = 0, and if there x(0) = y(0) = 0, then x(z)**y(z) \(-> 1 as z \(-> 0. .Ed .It If 0**0 = 1, then \*(If**0 = 1/0**0 = 1 too; and then \*(Na**0 = 1 too because x**0 = 1 for all finite and infinite x, i.e., independently of x. .El .Sh SEE ALSO .Xr clog 3 .Xr cpow 3 .Xr fenv 3 , .Xr ldexp 3 , .Xr log 3 , .Xr math 3 .Sh STANDARDS These functions conform to .St -isoC-99 . +.Sh HISTORY +The +.Fn exp +function appeared in +.At v1 . Index: stable/12/lib/msun/man/sin.3 =================================================================== --- stable/12/lib/msun/man/sin.3 (revision 363762) +++ stable/12/lib/msun/man/sin.3 (revision 363763) @@ -1,82 +1,87 @@ .\" Copyright (c) 1991 The Regents of the University of California. .\" All rights reserved. .\" .\" @(#)sin.3 6.7 (Berkeley) 4/19/91 .\" Redistribution and use in source and binary forms, with or without .\" modification, are permitted provided that the following conditions .\" are met: .\" 1. Redistributions of source code must retain the above copyright .\" notice, this list of conditions and the following disclaimer. .\" 2. Redistributions in binary form must reproduce the above copyright .\" notice, this list of conditions and the following disclaimer in the .\" documentation and/or other materials provided with the distribution. .\" 3. Neither the name of the University nor the names of its contributors .\" may be used to endorse or promote products derived from this software .\" without specific prior written permission. .\" .\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND .\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE .\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE .\" ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE .\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL .\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS .\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) .\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT .\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" .\" from: @(#)sin.3 6.7 (Berkeley) 4/19/91 .\" $FreeBSD$ .\" -.Dd January 24, 2008 +.Dd April 1, 2020 .Dt SIN 3 .Os .Sh NAME .Nm sin , .Nm sinf , .Nm sinl .Nd sine functions .Sh LIBRARY .Lb libm .Sh SYNOPSIS .In math.h .Ft double .Fn sin "double x" .Ft float .Fn sinf "float x" .Ft long double .Fn sinl "long double x" .Sh DESCRIPTION The .Fn sin , .Fn sinf , and .Fn sinl functions compute the sine of .Fa x (measured in radians). A large magnitude argument may yield a result with little or no significance. .Sh RETURN VALUES The .Fn sin , .Fn sinf , and .Fn sinl functions return the sine value. .Sh SEE ALSO .Xr acos 3 , .Xr asin 3 , .Xr atan 3 , .Xr atan2 3 , .Xr cos 3 , .Xr cosh 3 , .Xr csin 3 , .Xr math 3 , .Xr sinh 3 , .Xr tan 3 , .Xr tanh 3 .Sh STANDARDS These functions conform to .St -isoC-99 . +.Sh HISTORY +The +.Fn sin +function first appeared in +.At v1 . Index: stable/12 =================================================================== --- stable/12 (revision 363762) +++ stable/12 (revision 363763) Property changes on: stable/12 ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head:r359547,359629