Skip to content

Commit 48abed7

Browse files
committed
Use e.g. instead of less common f.e. [ci skip]
1 parent f65956e commit 48abed7

File tree

3 files changed

+13
-13
lines changed

3 files changed

+13
-13
lines changed

docs/release-process.md

+10-10
Original file line numberDiff line numberDiff line change
@@ -112,10 +112,10 @@
112112

113113
10. Bump the version numbers in `main/php_version.h`, `Zend/zend.h`,
114114
`configure.ac` and `NEWS` in the *main* branch (PHP-7.4 for example) to
115-
prepare for the **next** version. F.e. if the RC is "7.4.1RC1" then the new
116-
one should be `7.4.2-dev` - regardless if we get a new RC or not. This is to
117-
make sure `version_compare()` can correctly work. Commit the changes to the
118-
main branch.
115+
prepare for the **next** version. For example, if the RC is "7.4.1RC1" then
116+
the new one should be `7.4.2-dev` - regardless if we get a new RC or not.
117+
This is to make sure `version_compare()` can correctly work. Commit the
118+
changes to the main branch.
119119
120120
11. Push the changes to the main repo, the tag, the main branch and the release
121121
branch. Release branches for alpha/beta/.0RCx releases before to GA release
@@ -139,7 +139,7 @@
139139
have this directory, create it.
140140
141141
15. Now the RC can be found on https://downloads.php.net/~yourname,
142-
f.e. https://downloads.php.net/~derick/.
142+
e.g. https://downloads.php.net/~derick/.
143143
144144
16. Once the release has been tagged, contact the release-managers@ distribution
145145
list so that Windows binaries can be created. Once those are made, they can
@@ -204,7 +204,7 @@
204204
`Zend/zend.h`, `configure.ac` and possibly `NEWS`.
205205
206206
2. If a CVE commit needs to be merged to the release, then have it committed to
207-
the base branches and merged upwards as usual (f.e commit the CVE fix to
207+
the base branches and merged upwards as usual (e.g. commit the CVE fix to
208208
7.2, merge to 7.3, 7.4 etc...). Then you can cherry-pick it in your release
209209
branch. Don't forget to update `NEWS` manually in an extra commit then.
210210
@@ -219,9 +219,9 @@
219219
220220
6. Check `./sapi/cli/php -v` output for version matching.
221221
222-
7. Tag the repository with the version f.e. `git tag -u YOURKEYID php-7.4.1`
222+
7. Tag the repository with the version e.g. `git tag -u YOURKEYID php-7.4.1`
223223
224-
8. Push the tag f.e. `git push origin php-7.4.1`.
224+
8. Push the tag e.g. `git push origin php-7.4.1`.
225225
226226
9. Run: `./scripts/dev/makedist php-7.4.1`, this will export the tag,
227227
create configure and build three tarballs (gz, bz2 and xz). Check if the
@@ -289,7 +289,7 @@
289289
290290
5. Update the ChangeLog file for the given major version
291291
292-
f.e. `ChangeLog-7.php` from the `NEWS` file
292+
e.g. `ChangeLog-7.php` from the `NEWS` file
293293
294294
* Go over the list and put every element on one line.
295295
* Check for `&`, `<` and `>` and escape them if necessary.
@@ -319,7 +319,7 @@
319319
320320
8. **Check website has been synced before announcing or pushing news**
321321
322-
Try, f.e. https://www.php.net/distributions/php-7.4.0.tar.xz
322+
Try, e.g. https://www.php.net/distributions/php-7.4.0.tar.xz
323323
324324
Website may update slowly (may take an hour).
325325

ext/gd/libgd/gd_interpolation.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -2117,7 +2117,7 @@ gdImagePtr gdImageRotateInterpolated(const gdImagePtr src, const float angle, in
21172117
{
21182118
/* round to two decimals and keep the 100x multiplication to use it in the common square angles
21192119
case later. Keep the two decimal precisions so smaller rotation steps can be done, useful for
2120-
slow animations, f.e. */
2120+
slow animations. */
21212121
const int angle_rounded = fmod((int) floorf(angle * 100), 360 * 100);
21222122

21232123
if (bgcolor < 0) {

ext/odbc/config.m4

+2-2
Original file line numberDiff line numberDiff line change
@@ -291,8 +291,8 @@ PHP_ARG_WITH([custom-odbc],,
291291
[AS_HELP_STRING([[--with-custom-odbc[=DIR]]],
292292
[Include user defined ODBC support. DIR is ODBC install base directory
293293
[/usr/local]. Make sure to define CUSTOM_ODBC_LIBS and have some odbc.h in
294-
your include dirs. f.e. you should define following for Sybase SQL Anywhere
295-
5.5.00 on QNX, prior to running this configure script:
294+
your include dirs. For example, you should define following for Sybase SQL
295+
Anywhere 5.5.00 on QNX, prior to running this configure script:
296296
CPPFLAGS="-DODBC_QNX -DSQLANY_BUG" LDFLAGS=-lunix
297297
CUSTOM_ODBC_LIBS="-ldblib -lodbc"])])
298298

0 commit comments

Comments
 (0)