Correct word usage of "timezone" in "Documentation" directory
"timezone" is two words, not one (i.e. "time zone" is correct). Correct this in these files: -- date-formats.txt -- git-blame.txt -- git-cvsimport.txt -- git-fast-import.txt -- git-svn.txt -- gitweb.conf.txt -- rev-list-options.txt Signed-off-by: Jason St. John <jstjohn@purdue.edu> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Jason St. John committed
Nov 8, 2013 at 19:48 UTC
0ffa154b5b37396462aeff3750933f05982ace63
7 files changed
+22
-22
Documentation/date-formats.txt
+2
-2
@@ -8,9 +8,9 @@ endif::git-commit[]
8
support the following date formats:
9
10
Git internal format::
11
- It is `<unix timestamp> <timezone offset>`, where `<unix
11
+ It is `<unix timestamp> <time zone offset>`, where `<unix
12
timestamp>` is the number of seconds since the UNIX epoch.
13
- `<timezone offset>` is a positive or negative offset from UTC.
13
+ `<time zone offset>` is a positive or negative offset from UTC.
14
For example CET (which is 2 hours ahead UTC) is `+0200`.
15
16
RFC 2822::
Documentation/git-blame.txt
+1
-1
@@ -103,7 +103,7 @@ This header line is followed by the following information
103
at least once for each commit:
104
105
- the author name ("author"), email ("author-mail"), time
106
- ("author-time"), and timezone ("author-tz"); similarly
106
+ ("author-time"), and time zone ("author-tz"); similarly
107
for committer.
108
- the filename in the commit that the line is attributed to.
109
- the first line of the commit log message ("summary").
Documentation/git-cvsimport.txt
+2
-2
@@ -144,7 +144,7 @@ This option can be used several times to provide several detection regexes.
144
CVS by default uses the Unix username when writing its
145
commit logs. Using this option and an author-conv-file
146
maps the name recorded in CVS to author name, e-mail and
147
- optional timezone:
147
+ optional time zone:
148
+
149
---------
150
exon=Andreas Ericsson <ae@op5.se>
@@ -154,7 +154,7 @@ This option can be used several times to provide several detection regexes.
154
+
155
'git cvsimport' will make it appear as those authors had
156
their GIT_AUTHOR_NAME and GIT_AUTHOR_EMAIL set properly
157
-all along. If a timezone is specified, GIT_AUTHOR_DATE will
157
+all along. If a time zone is specified, GIT_AUTHOR_DATE will
158
have the corresponding offset applied.
159
+
160
For convenience, this data is saved to `$GIT_DIR/cvs-authors`
Documentation/git-fast-import.txt
+5
-5
@@ -251,7 +251,7 @@ advisement to help formatting routines display the timestamp.
251
If the local offset is not available in the source material, use
252
``+0000'', or the most common local offset. For example many
253
organizations have a CVS repository which has only ever been accessed
254
-by users who are located in the same location and timezone. In this
254
+by users who are located in the same location and time zone. In this
255
case a reasonable offset from UTC could be assumed.
256
+
257
Unlike the `rfc2822` format, this format is very strict. Any
@@ -271,7 +271,7 @@ the malformed string. There are also some types of malformed
271
strings which Git will parse wrong, and yet consider valid.
272
Seriously malformed strings will be rejected.
273
+
274
-Unlike the `raw` format above, the timezone/UTC offset information
274
+Unlike the `raw` format above, the time zone/UTC offset information
275
contained in an RFC 2822 date string is used to adjust the date
276
value to UTC prior to storage. Therefore it is important that
277
this information be as accurate as possible.
@@ -287,13 +287,13 @@ format, or its format is easily convertible to it, as there is no
287
ambiguity in parsing.
288
289
`now`::
290
- Always use the current time and timezone. The literal
290
+ Always use the current time and time zone. The literal
291
`now` must always be supplied for `<when>`.
292
+
293
-This is a toy format. The current time and timezone of this system
293
+This is a toy format. The current time and time zone of this system
294
is always copied into the identity string at the time it is being
295
created by fast-import. There is no way to specify a different time or
296
-timezone.
296
+time zone.
297
+
298
This particular format is supplied as it's short to implement and
299
may be useful to a process that wants to create a new commit
Documentation/git-svn.txt
+3
-3
@@ -124,15 +124,15 @@ This automatically updates the rev_map if needed (see
124
'$GIT_DIR/svn/\*\*/.rev_map.*' in the FILES section below for details).
125
126
--localtime;;
127
- Store Git commit times in the local timezone instead of UTC. This
127
+ Store Git commit times in the local time zone instead of UTC. This
128
makes 'git log' (even without --date=local) show the same times
129
- that `svn log` would in the local timezone.
129
+ that `svn log` would in the local time zone.
130
+
131
This doesn't interfere with interoperating with the Subversion
132
repository you cloned from, but if you wish for your local Git
133
repository to be able to interoperate with someone else's local Git
134
repository, either don't use this option or you should both use it in
135
-the same local timezone.
135
+the same local time zone.
136
137
--parent;;
138
Fetch only from the SVN parent of the current HEAD.
Documentation/gitweb.conf.txt
+7
-7
@@ -822,18 +822,18 @@ timed::
822
Project specific override is not supported.
823
824
javascript-timezone::
825
- Enable and configure the ability to change a common timezone for dates
825
+ Enable and configure the ability to change a common time zone for dates
826
in gitweb output via JavaScript. Dates in gitweb output include
827
authordate and committerdate in "commit", "commitdiff" and "log"
828
views, and taggerdate in "tag" view. Enabled by default.
829
+
830
-The value is a list of three values: a default timezone (for if the client
831
-hasn't selected some other timezone and saved it in a cookie), a name of cookie
832
-where to store selected timezone, and a CSS class used to mark up
830
+The value is a list of three values: a default time zone (for if the client
831
+hasn't selected some other time zone and saved it in a cookie), a name of cookie
832
+where to store selected time zone, and a CSS class used to mark up
833
dates for manipulation. If you want to turn this feature off, set "default"
834
to empty list: `[]`.
835
+
836
-Typical gitweb config files will only change starting (default) timezone,
836
+Typical gitweb config files will only change starting (default) time zone,
837
and leave other elements at their default values:
838
+
839
---------------------------------------------------------------------------
@@ -843,9 +843,9 @@ $feature{'javascript-timezone'}{'default'}[0] = "utc";
843
The example configuration presented here is guaranteed to be backwards
844
and forward compatible.
845
+
846
-Timezone values can be "local" (for local timezone that browser uses), "utc"
846
+Time zone values can be "local" (for local time zone that browser uses), "utc"
847
(what gitweb uses when JavaScript or this feature is disabled), or numerical
848
-timezones in the form of "+/-HHMM", such as "+0200".
848
+time zones in the form of "+/-HHMM", such as "+0200".
849
+
850
Project specific override is not supported.
851
Documentation/rev-list-options.txt
+2
-2
@@ -720,7 +720,7 @@ include::pretty-options.txt[]
720
`--date=relative` shows dates relative to the current time,
721
e.g. "2 hours ago".
722
+
723
-`--date=local` shows timestamps in user's local timezone.
723
+`--date=local` shows timestamps in user's local time zone.
724
+
725
`--date=iso` (or `--date=iso8601`) shows timestamps in ISO 8601 format.
726
+
@@ -731,7 +731,7 @@ format, often found in E-mail messages.
731
+
732
`--date=raw` shows the date in the internal raw Git format `%s %z` format.
733
+
734
-`--date=default` shows timestamps in the original timezone
734
+`--date=default` shows timestamps in the original time zone
735
(either committer's or author's).
736
737
ifdef::git-rev-list[]