From 16cccd479e4cdce23faa3a0057b778cbcddeb647 Mon Sep 17 00:00:00 2001 From: Ryan Schmidt Date: Fri, 28 Aug 2009 11:12:47 +0000 Subject: [PATCH] eg => e.g. git-svn-id: https://svn.macports.org/repository/macports/trunk/base@56470 d073be05-634f-4543-b044-5fe20cf6d1d6 --- ChangeLog | 2 +- doc/portfile.7 | 14 +++++++------- m4/tcl.m4 | 2 +- src/pextlib1.0/Pextlib.c | 2 +- src/port/port-help.tcl | 2 +- src/port1.0/portutil.tcl | 2 +- src/upgrade_sources_conf_default.tcl | 2 +- 7 files changed, 13 insertions(+), 13 deletions(-) diff --git a/ChangeLog b/ChangeLog index e78ba27a4..c4949da7d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -660,7 +660,7 @@ Release 1.4.41 (16-May-2007 tagged at r25266 by jberry): - `port info` now supports new --index flag for using old behaviour (eridius r25256). - `port info` now opens the Portfile and displays up-to-date information. - This allows information about variants to be displayed (eg. dependencies). + This allows information about variants to be displayed (e.g. dependencies). Also allow `port info` to default to current directory if no name is provided (eridius r25255). diff --git a/doc/portfile.7 b/doc/portfile.7 index d101e3602..1948661e6 100644 --- a/doc/portfile.7 +++ b/doc/portfile.7 @@ -430,33 +430,33 @@ Location to store downloaded distfiles. .Sy Default: .Em ${sysportpath}/distfiles/${dist_subdir}/ .It Ic os.arch -Identifies hardware type (eg "powerpc"). +Identifies hardware type (e.g. "powerpc"). .br .Sy Type: .Em read-only .It Ic os.version -Version number of operating system (eg "7.0"). +Version number of operating system (e.g. "7.0"). .br .Sy Type: .Em read-only .It Ic os.endian -Endianness of the processor (eg "bigEndian"). +Endianness of the processor (e.g. "bigEndian"). .br .Sy Type: .Em read-only .It Ic os.platform -Operating system name (eg "darwin"). +Operating system name (e.g. "darwin"). .br .Sy Type: .Em read-only .It Ic install.user -User for MacPorts installation (eg +User for MacPorts installation (e.g. .Pa root ) .br .Sy Type: .Em read-only .It Ic install.group -Group for MacPorts installation (eg +Group for MacPorts installation (e.g. .Pa wheel ) .br .Sy Type: @@ -1958,7 +1958,7 @@ Compute the MD5 hashes of the file(s). Compare two RPM-format versions for equality. The return value is like strcmp(), returning -1, 0, or 1 when versionA is earlier, equal to, or later than versionB, respectively. Note that some comparisions featuring -floating-point notation may compare incorrectly, eg, 2.101 is considered +floating-point notation may compare incorrectly, e.g. 2.101 is considered later than 2.2 (101 is larger than 2) which may be incorrect per some projects versioning methods (see ticket #11873). .It Xo diff --git a/m4/tcl.m4 b/m4/tcl.m4 index 305430a12..c30c67660 100644 --- a/m4/tcl.m4 +++ b/m4/tcl.m4 @@ -2230,7 +2230,7 @@ AC_DEFUN(SC_TIME_HANDLER, [ AC_DEFINE(HAVE_TIMEZONE_VAR) else # - # On some systems (eg IRIX 6.2), timezone is a time_t and not a long. + # On some systems (e.g. IRIX 6.2), timezone is a time_t and not a long. # AC_MSG_CHECKING([time_t timezone variable]) AC_CACHE_VAL(tcl_cv_timezone_time, diff --git a/src/pextlib1.0/Pextlib.c b/src/pextlib1.0/Pextlib.c index 1a39ebb6f..39e510edc 100644 --- a/src/pextlib1.0/Pextlib.c +++ b/src/pextlib1.0/Pextlib.c @@ -512,7 +512,7 @@ int UnsetEnvCmd(ClientData clientData UNUSED, Tcl_Interp *interp, int objc, Tcl_ (void) unsetenv(name); } /* Tcl appears to become out of sync with the environment when we - unset things, eg, 'info exists env(CC)' will succeed where + unset things, e.g. 'info exists env(CC)' will succeed where 'puts $env(CC)' will fail since it doesn't actually exist after being unset here. This forces Tcl to resync to the current state (don't care about the actual result, so reset it) */ diff --git a/src/port/port-help.tcl b/src/port/port-help.tcl index 9dbbf17b0..1d04605b2 100644 --- a/src/port/port-help.tcl +++ b/src/port/port-help.tcl @@ -229,7 +229,7 @@ Select between multiple versions of a versioned port This allows you to choose which version, among several installed versions of a port, is to be considered primary. What this means is which version -becomes the one most would consider the default, eg, the one run without +becomes the one most would consider the default, e.g. the one run without specifying any version. One example is the set of python ports, where there are (among others) diff --git a/src/port1.0/portutil.tcl b/src/port1.0/portutil.tcl index 5519a0e4c..07784b08d 100644 --- a/src/port1.0/portutil.tcl +++ b/src/port1.0/portutil.tcl @@ -1495,7 +1495,7 @@ proc open_statefile {args} { if { [getuid] != 0 } { ui_msg "MacPorts running without privileges.\ - You may be unable to complete certain actions (eg install)." + You may be unable to complete certain actions (e.g. install)." } # de-escalate privileges if MacPorts was started with sudo diff --git a/src/upgrade_sources_conf_default.tcl b/src/upgrade_sources_conf_default.tcl index a2797bcd2..76ddeb110 100755 --- a/src/upgrade_sources_conf_default.tcl +++ b/src/upgrade_sources_conf_default.tcl @@ -94,7 +94,7 @@ Warning, your source config file at: needs to have a \[default\] tag added to the primary MacPorts repository, however the proper entry could not be determined. Please add the tag manually by either appending \[default\] to the end of the correct line, -or if there are already tags, adding it to the list, eg, +or if there are already tags, adding it to the list, e.g. \[nosync,default\]. [string repeat - 72]" }