Skip to content

Commit ef85cdc

Browse files
committed
Replace "eg" by "e.g." or "for example"
1 parent 5e87155 commit ef85cdc

File tree

194 files changed

+405
-404
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

194 files changed

+405
-404
lines changed

INSTALL

+2-2
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ source directory.
8787
2. Overview
8888
===========
8989

90-
QGIS, like a number of major projects (eg. KDE 4.0), uses CMake
90+
QGIS, like a number of major projects (e.g., KDE 4.0), uses CMake
9191
(http://www.cmake.org) for building from source.
9292

9393
Following a summary of the required dependencies for building:
@@ -125,7 +125,7 @@ Optional dependencies:
125125

126126
Indirect dependencies:
127127

128-
Some proprietary formats (eg. ECW and MrSid) supported by GDAL require
128+
Some proprietary formats (e.g., ECW and MrSid) supported by GDAL require
129129
proprietary third party libraries. QGIS doesn't need any of those itself to
130130
build, but will only support those formats if GDAL is built accordingly. Refer
131131
to http://gdal.org/formats_list.html ff. for instructions how to include

NEWS

+2-2
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ This release has following new features:
9494
- Map Composer: Parameterized svg support for composer svg images
9595
- Map Composer: Easier use of HTML in labels
9696
- Map Composer: Relative links in composer labels
97-
- Map Composer: Georeference outputs (eg PDF) from composer
97+
- Map Composer: Georeference outputs (e.g., PDF) from composer
9898
- Map Composer: Composer maps now auto-update with presets
9999
- Analysis tools: Named parameters in expressions
100100
- Analysis tools: More distance units
@@ -814,7 +814,7 @@ changed so we will just provide a bullet list of key new features here.
814814

815815
- Optionally re-use entered attribute values for next digitized feature.
816816
- Allow merging/assigning attribute values to a set of features.-
817-
- Allow OGR 'save as' without attributes (for eg. DGN/DXF).
817+
- Allow OGR 'save as' without attributes (e.g., DGN/DXF).
818818

819819

820820
14.7. Api and Developer Centric

doc/INSTALL.html

+2-2
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@ <H1>1. Introduction</H1>
186186
<H1>2. Overview</H1>
187187

188188
<P>
189-
QGIS, like a number of major projects (eg. KDE 4.0), uses CMake
189+
QGIS, like a number of major projects (e.g., KDE 4.0), uses CMake
190190
(<A HREF="http://www.cmake.org">http://www.cmake.org</A>) for building from source.
191191
</P>
192192
<P>
@@ -239,7 +239,7 @@ <H1>2. Overview</H1>
239239
Indirect dependencies:
240240
</P>
241241
<P>
242-
Some proprietary formats (eg. ECW and MrSid) supported by GDAL require
242+
Some proprietary formats (e.g., ECW and MrSid) supported by GDAL require
243243
proprietary third party libraries. QGIS doesn't need any of those itself to
244244
build, but will only support those formats if GDAL is built accordingly. Refer
245245
to <A HREF="http://gdal.org/formats_list.html">http://gdal.org/formats_list.html</A> ff. for instructions how to include

doc/news.html

+2-2
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@ <H1>1. What's new in Version 2.16 'Nødebo'?</H1>
174174
<LI>Map Composer: Parameterized svg support for composer svg images
175175
<LI>Map Composer: Easier use of HTML in labels
176176
<LI>Map Composer: Relative links in composer labels
177-
<LI>Map Composer: Georeference outputs (eg PDF) from composer
177+
<LI>Map Composer: Georeference outputs (e.g., PDF) from composer
178178
<LI>Map Composer: Composer maps now auto-update with presets
179179
<LI>Analysis tools: Named parameters in expressions
180180
<LI>Analysis tools: More distance units
@@ -935,7 +935,7 @@ <H2>14.6. Providers and Data Handling</H2>
935935
<UL>
936936
<LI>Optionally re-use entered attribute values for next digitized feature.
937937
<LI>Allow merging/assigning attribute values to a set of features.-
938-
<LI>Allow OGR 'save as' without attributes (for eg. DGN/DXF).
938+
<LI>Allow OGR 'save as' without attributes (e.g., DGN/DXF).
939939
</UL>
940940
</UL>
941941

doc/news.t2t

+1-1
Original file line numberDiff line numberDiff line change
@@ -795,7 +795,7 @@ changed so we will just provide a bullet list of key new features here.
795795

796796
- Optionally re-use entered attribute values for next digitized feature.
797797
- Allow merging/assigning attribute values to a set of features.-
798-
- Allow OGR 'save as' without attributes (for eg. DGN/DXF).
798+
- Allow OGR 'save as' without attributes (e.g., DGN/DXF).
799799
-
800800
-
801801

doc/overview.t2t

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
= Overview =
33

4-
QGIS, like a number of major projects (eg. KDE 4.0), uses CMake
4+
QGIS, like a number of major projects (e.g., KDE 4.0), uses CMake
55
(http://www.cmake.org) for building from source.
66

77
Following a summary of the required dependencies for building:
@@ -45,7 +45,7 @@ Optional dependencies:
4545

4646
Indirect dependencies:
4747

48-
Some proprietary formats (eg. ECW and MrSid) supported by GDAL require
48+
Some proprietary formats (e.g., ECW and MrSid) supported by GDAL require
4949
proprietary third party libraries. QGIS doesn't need any of those itself to
5050
build, but will only support those formats if GDAL is built accordingly. Refer
5151
to http://gdal.org/formats_list.html ff. for instructions how to include

python/core/composer/qgscomposerattributetablev2.sip

+1-1
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ class QgsComposerAttributeTableV2 : QgsComposerTableV2
7676
*/
7777
ContentSource source() const;
7878

79-
/** Returns the source layer for the table, considering the table source mode. Eg,
79+
/** Returns the source layer for the table, considering the table source mode. For example,
8080
* if the table is set to atlas feature mode, then the source layer will be the
8181
* atlas coverage layer. If the table is set to layer attributes mode, then
8282
* the source layer will be the user specified vector layer.

python/core/composer/qgscomposeritem.sip

+3-3
Original file line numberDiff line numberDiff line change
@@ -416,15 +416,15 @@ class QgsComposerItem : QgsComposerObject, QGraphicsRectItem
416416
*/
417417
void setTransparency( const int transparency );
418418

419-
/** Returns whether effects (eg blend modes) are enabled for the item
419+
/** Returns whether effects (e.g., blend modes) are enabled for the item
420420
* @returns true if effects are enabled
421421
* @see setEffectsEnabled
422422
* @see transparency
423423
* @see blendMode
424424
*/
425425
bool effectsEnabled() const;
426426

427-
/** Sets whether effects (eg blend modes) are enabled for the item
427+
/** Sets whether effects (e.g., blend modes) are enabled for the item
428428
* @param effectsEnabled set to true to enable effects
429429
* @see effectsEnabled
430430
* @see setTransparency
@@ -508,7 +508,7 @@ class QgsComposerItem : QgsComposerObject, QGraphicsRectItem
508508
/** Sets visibility for item.
509509
* @param visible set to true to show item, false to hide item
510510
* @note QGraphicsItem::setVisible should not be called directly
511-
* on a QgsComposerItem, as some item types (eg groups) need to override
511+
* on a QgsComposerItem, as some item types (e.g., groups) need to override
512512
* the visibility toggle.
513513
* @note added in version 2.5
514514
*/

python/core/composer/qgscomposermapitem.sip

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/** \ingroup core
22
* \class QgsComposerMapItem
3-
* \brief An item which is drawn inside a QgsComposerMap, eg a grid or map overview.
3+
* \brief An item which is drawn inside a QgsComposerMap, e.g., a grid or map overview.
44
*/
55
class QgsComposerMapItem : QgsComposerObject
66
{

python/core/composer/qgscomposermultiframe.sip

+1-1
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,7 @@ class QgsComposerMultiFrame: QgsComposerObject
205205

206206
/** Creates a new frame and adds it to the multi frame and composition.
207207
* @param currentFrame an existing QgsComposerFrame from which to copy the size
208-
* and general frame properties (eg frame style, background, rendering settings).
208+
* and general frame properties (e.g., frame style, background, rendering settings).
209209
* @param pos position of top-left corner of the new frame
210210
* @param size size of the new frame
211211
* @returns new QgsComposerFrame

python/core/composer/qgscomposition.sip

+1-1
Original file line numberDiff line numberDiff line change
@@ -732,7 +732,7 @@ class QgsComposition : QGraphicsScene, QgsExpressionContextGenerator
732732

733733
/** Calculates the bounds of all non-gui items in the composition. Ignores snap lines and mouse handles.
734734
* @param ignorePages set to true to ignore page items
735-
* @param margin optional marginal (in percent, eg 0.05 = 5% ) to add around items
735+
* @param margin optional marginal (in percent, e.g., 0.05 = 5% ) to add around items
736736
*/
737737
QRectF compositionBounds( bool ignorePages = false, double margin = 0.0 ) const;
738738

python/core/effects/qgscoloreffect.sip

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/** \ingroup core
22
* \class QgsColorEffect
3-
* \brief A paint effect which alters the colors (eg brightness, contrast) in a
3+
* \brief A paint effect which alters the colors (e.g., brightness, contrast) in a
44
* source picture.
55
*
66
* \note Added in version 2.9

python/core/geometry/qgsabstractgeometry.sip

+1-1
Original file line numberDiff line numberDiff line change
@@ -398,7 +398,7 @@ class QgsAbstractGeometry
398398
*/
399399
virtual QgsRectangle calculateBoundingBox() const;
400400

401-
/** Clears any cached parameters associated with the geometry, eg bounding boxes
401+
/** Clears any cached parameters associated with the geometry, e.g., bounding boxes
402402
*/
403403
virtual void clearCache() const;
404404
};

python/core/geometry/qgsgeometry.sip

+2-2
Original file line numberDiff line numberDiff line change
@@ -551,7 +551,7 @@ class QgsGeometry
551551

552552
/**
553553
* Returns a point guaranteed to lie on the surface of a geometry. While the centroid()
554-
* of a geometry may be located outside of the geometry itself (eg for concave shapes),
554+
* of a geometry may be located outside of the geometry itself (e.g., for concave shapes),
555555
* the point on surface will always be inside the geometry.
556556
* @see centroid()
557557
* @see poleOfInaccessibility()
@@ -892,7 +892,7 @@ class QgsGeometry
892892
* @param iterations number of smoothing iterations to run. More iterations results
893893
* in a smoother geometry
894894
* @param offset fraction of line to create new vertices along, between 0 and 1.0
895-
* eg the default value of 0.25 will create new vertices 25% and 75% along each line segment
895+
* For example, the default value of 0.25 will create new vertices 25% and 75% along each line segment
896896
* of the geometry for each iteration. Smaller values result in "tighter" smoothing.
897897
* @param minimumDistance minimum segment length to apply smoothing to
898898
* @param maxAngle maximum angle at node (0-180) at which smoothing will be applied

python/core/geometry/qgspointv2.sip

+5-5
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ class QgsPointV2: public QgsAbstractGeometry
2525
*/
2626
explicit QgsPointV2( QPointF p );
2727

28-
/** Construct a point with a specified type (eg PointZ, PointM) and initial x, y, z, and m values.
28+
/** Construct a point with a specified type (e.g., PointZ, PointM) and initial x, y, z, and m values.
2929
* @param type point type
3030
* @param x x-coordinate of point
3131
* @param y y-coordinate of point
@@ -140,17 +140,17 @@ class QgsPointV2: public QgsAbstractGeometry
140140

141141
/**
142142
* Returns the distance between this point and a specified x, y coordinate. In certain
143-
* cases it may be more appropriate to call the faster distanceSquared() method, eg
144-
* when comparing distances.
143+
* cases it may be more appropriate to call the faster distanceSquared() method,
144+
* e.g., when comparing distances.
145145
* @note added in QGIS 3.0
146146
* @see distanceSquared()
147147
*/
148148
double distance( double x, double y ) const;
149149

150150
/**
151151
* Returns the 2D distance between this point and another point. In certain
152-
* cases it may be more appropriate to call the faster distanceSquared() method, eg
153-
* when comparing distances.
152+
* cases it may be more appropriate to call the faster distanceSquared() method,
153+
* e.g., when comparing distances.
154154
* @note added in QGIS 3.0
155155
*/
156156
double distance( const QgsPointV2& other ) const;

python/core/geometry/qgswkbtypes.sip

+5-5
Original file line numberDiff line numberDiff line change
@@ -75,22 +75,22 @@ class QgsWkbTypes
7575
NullGeometry
7676
};
7777

78-
/** Returns the single type for a WKB type. Eg, for MultiPolygon WKB types the single type would be Polygon.
78+
/** Returns the single type for a WKB type. For example, for MultiPolygon WKB types the single type would be Polygon.
7979
* @see isSingleType()
8080
* @see multiType()
8181
* @see flatType()
8282
*/
8383
static Type singleType( Type type );
8484

85-
/** Returns the multi type for a WKB type. Eg, for Polygon WKB types the multi type would be MultiPolygon.
85+
/** Returns the multi type for a WKB type. For example, for Polygon WKB types the multi type would be MultiPolygon.
8686
* @see isMultiType()
8787
* @see singleType()
8888
* @see flatType()
8989
*/
9090
static Type multiType( Type type );
9191

9292
/** Returns the flat type for a WKB type. This is the WKB type minus any Z or M dimensions.
93-
* Eg, for PolygonZM WKB types the single type would be Polygon.
93+
* For example, for PolygonZM WKB types the single type would be Polygon.
9494
* @see singleType()
9595
* @see multiType()
9696
*/
@@ -137,12 +137,12 @@ class QgsWkbTypes
137137
*/
138138
static int coordDimensions( Type type );
139139

140-
/** Returns the geometry type for a WKB type, eg both MultiPolygon and CurvePolygon would have a
140+
/** Returns the geometry type for a WKB type, e.g., both MultiPolygon and CurvePolygon would have a
141141
* PolygonGeometry geometry type.
142142
*/
143143
static GeometryType geometryType( Type type );
144144

145-
/** Returns a display string type for a WKB type, eg the geometry name used in WKT geometry representations.
145+
/** Returns a display string type for a WKB type, e.g., the geometry name used in WKT geometry representations.
146146
*/
147147
static QString displayString( Type type );
148148

python/core/qgis.sip

+2-2
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ class Qgis
104104
static double SCALE_PRECISION;
105105
};
106106

107-
/** Converts a string to a double in a permissive way, eg allowing for incorrect
107+
/** Converts a string to a double in a permissive way, e.g., allowing for incorrect
108108
* numbers of digits between thousand separators
109109
* @param string string to convert
110110
* @param ok will be set to true if conversion was successful
@@ -114,7 +114,7 @@ class Qgis
114114
*/
115115
double qgsPermissiveToDouble( QString string, bool& ok );
116116

117-
/** Converts a string to an integer in a permissive way, eg allowing for incorrect
117+
/** Converts a string to an integer in a permissive way, e.g., allowing for incorrect
118118
* numbers of digits between thousand separators
119119
* @param string string to convert
120120
* @param ok will be set to true if conversion was successful

python/core/qgsapplication.sip

+1-1
Original file line numberDiff line numberDiff line change
@@ -248,7 +248,7 @@ static void qtgui_UpdatePyArgv(PyObject *argvlist, int argc, char **argv)
248248
*/
249249
static QString osName();
250250

251-
/** Returns the QGIS platform name, eg "desktop" or "server".
251+
/** Returns the QGIS platform name, e.g., "desktop" or "server".
252252
* @note added in QGIS 2.14
253253
* @see osName()
254254
*/

python/core/qgscolorramp.sip

+2-2
Original file line numberDiff line numberDiff line change
@@ -183,12 +183,12 @@ class QgsGradientColorRamp : QgsColorRamp
183183
*/
184184
QgsGradientStopsList stops() const;
185185

186-
/** Returns any additional info attached to the gradient ramp (eg authorship notes)
186+
/** Returns any additional info attached to the gradient ramp (e.g., authorship notes)
187187
* @see setInfo()
188188
*/
189189
QgsStringMap info() const;
190190

191-
/** Sets additional info to attach to the gradient ramp (eg authorship notes)
191+
/** Sets additional info to attach to the gradient ramp (e.g., authorship notes)
192192
* @param info map of string info to attach
193193
* @see info()
194194
*/

python/core/qgscoordinatereferencesystem.sip

+5-5
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@ class QgsCoordinateReferenceSystem
186186
// static creators
187187

188188
/** Creates a CRS from a given OGC WMS-format Coordinate Reference System string.
189-
* @param ogcCrs OGR compliant CRS definition, eg "EPSG:4326"
189+
* @param ogcCrs OGR compliant CRS definition, e.g., "EPSG:4326"
190190
* @returns matching CRS, or an invalid CRS if string could not be matched
191191
* @note added in QGIS 3.0
192192
* @see createFromOgcWmsCrs()
@@ -416,9 +416,9 @@ class QgsCoordinateReferenceSystem
416416

417417
/** Returns the authority identifier for the CRS.
418418
*
419-
* The identifier includes both the authority (eg EPSG) and the CRS number (eg 4326).
419+
* The identifier includes both the authority (e.g., EPSG) and the CRS number (e.g., 4326).
420420
* This is the best method to use when showing a very short CRS identifier to a user,
421-
* eg "EPSG:4326".
421+
* e.g., "EPSG:4326".
422422
*
423423
* If CRS object is a custom CRS (not found in database), the method will return
424424
* internal QGIS CRS ID with "QGIS" authority, for example "QGIS:100005"
@@ -427,7 +427,7 @@ class QgsCoordinateReferenceSystem
427427
*/
428428
QString authid() const;
429429

430-
/** Returns the descriptive name of the CRS, eg "WGS 84" or "GDA 94 / Vicgrid94". In most
430+
/** Returns the descriptive name of the CRS, e.g., "WGS 84" or "GDA 94 / Vicgrid94". In most
431431
* cases this is the best method to use when showing a friendly identifier for the CRS to a
432432
* user.
433433
* @returns descriptive name of the CRS
@@ -472,7 +472,7 @@ class QgsCoordinateReferenceSystem
472472
*/
473473
bool isGeographic() const;
474474

475-
/** Returns whether axis is inverted (eg. for WMS 1.3) for the CRS.
475+
/** Returns whether axis is inverted (e.g., for WMS 1.3) for the CRS.
476476
* @returns true if CRS axis is inverted
477477
*/
478478
bool hasAxisInverted() const;

python/core/qgsdatetimestatisticalsummary.sip

+2-2
Original file line numberDiff line numberDiff line change
@@ -37,13 +37,13 @@ class QgsDateTimeStatisticalSummary
3737
QgsDateTimeStatisticalSummary( QgsDateTimeStatisticalSummary::Statistics stats = All );
3838

3939
/** Returns flags which specify which statistics will be calculated. Some statistics
40-
* are always calculated (eg count).
40+
* are always calculated (e.g., count).
4141
* @see setStatistics
4242
*/
4343
Statistics statistics() const;
4444

4545
/** Sets flags which specify which statistics will be calculated. Some statistics
46-
* are always calculated (eg count).
46+
* are always calculated (e.g., count).
4747
* @param stats flags for statistics to calculate
4848
* @see statistics
4949
*/

python/core/qgsdistancearea.sip

+2-2
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ class QgsDistanceArea
167167
* @param distance distance to format
168168
* @param decimals number of decimal places to show
169169
* @param unit unit of distance
170-
* @param keepBaseUnit set to false to allow conversion of large distances to more suitable units, eg meters to
170+
* @param keepBaseUnit set to false to allow conversion of large distances to more suitable units, e.g., meters to
171171
* kilometers
172172
* @returns formatted distance string
173173
* @note added in QGIS 2.16
@@ -179,7 +179,7 @@ class QgsDistanceArea
179179
* @param area area to format
180180
* @param decimals number of decimal places to show
181181
* @param unit unit of area
182-
* @param keepBaseUnit set to false to allow conversion of large areas to more suitable units, eg square meters to
182+
* @param keepBaseUnit set to false to allow conversion of large areas to more suitable units, e.g., square meters to
183183
* square kilometers
184184
* @returns formatted area string
185185
* @note added in QGIS 2.14

0 commit comments

Comments
 (0)