aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard M. Stallman2005-03-08 03:01:55 +0000
committerRichard M. Stallman2005-03-08 03:01:55 +0000
commit0111d1e150de2d5e92a0cb960d4c7b650c92ea82 (patch)
tree03508e8a05eb2de9cc836e06ec402b2b43807112
parent66dd6a003cd6786e18189794dc8710621040c58d (diff)
downloademacs-0111d1e150de2d5e92a0cb960d4c7b650c92ea82.tar.gz
emacs-0111d1e150de2d5e92a0cb960d4c7b650c92ea82.zip
Fix usage of "e.g.".
(HTTP language/coding): Explain the rules for these strings.
-rw-r--r--man/url.texi36
1 files changed, 20 insertions, 16 deletions
diff --git a/man/url.texi b/man/url.texi
index aa4188b196f..e06656ef5b5 100644
--- a/man/url.texi
+++ b/man/url.texi
@@ -109,7 +109,7 @@ use the `well known' port for that service when accessing URLs. With
109the possible exception of @code{telnet}, it is rare for ports to be 109the possible exception of @code{telnet}, it is rare for ports to be
110specified, and it is possible using a non-standard port may have 110specified, and it is possible using a non-standard port may have
111undesired consequences if a different service is listening on that 111undesired consequences if a different service is listening on that
112port (e.g.@: an HTTP URL specifying the SMTP port can cause mail to be 112port (e.g., an HTTP URL specifying the SMTP port can cause mail to be
113sent).@c , but @xref{Other Variables, url-bad-port-list}. 113sent).@c , but @xref{Other Variables, url-bad-port-list}.
114The meaning of 114The meaning of
115the @var{path} component depends on the service. 115the @var{path} component depends on the service.
@@ -142,7 +142,7 @@ URLs. These are actually vectors of the form:
142@noindent where 142@noindent where
143@table @var 143@table @var
144@item type 144@item type
145is the type of the URL scheme, e.g.@: @code{http} 145is the type of the URL scheme, e.g., @code{http}
146@item user 146@item user
147is the username associated with it, or @code{nil}; 147is the username associated with it, or @code{nil};
148@item password 148@item password
@@ -182,7 +182,7 @@ is @code{t} for a fully-specified URL, with a host part indicated by
182@findex url-set-attributes 182@findex url-set-attributes
183@findex url-set-full 183@findex url-set-full
184These attributes have accessors named @code{url-@var{part}}, where 184These attributes have accessors named @code{url-@var{part}}, where
185@var{part} is the name of one of the elements above, e.g.@: 185@var{part} is the name of one of the elements above, e.g.,
186@code{url-host}. Similarly, there are setters of the form 186@code{url-host}. Similarly, there are setters of the form
187@code{url-set-@var{part}}. 187@code{url-set-@var{part}}.
188 188
@@ -317,7 +317,12 @@ Default is one hour.
317@subsection Language and Encoding Preferences 317@subsection Language and Encoding Preferences
318 318
319HTTP allows clients to express preferences for the language and 319HTTP allows clients to express preferences for the language and
320encoding of documents which servers may honour. 320encoding of documents which servers may honour. For each of these
321variables, the value is a string; it can specify a single choice, or
322it can be a comma-separated list in descending order of preference.
323Each element can be followed by @samp{;q=@var{priority}} to specify
324its preference level; e.g., for @code{url-mime-language-string},
325@w{@code{"de, en-gb;q=0.8, en;q=0.7"}}.
321 326
322@defopt url-mime-charset-string 327@defopt url-mime-charset-string
323@cindex character sets 328@cindex character sets
@@ -325,23 +330,22 @@ encoding of documents which servers may honour.
325This variable specifies a preference for character sets when documents 330This variable specifies a preference for character sets when documents
326can be served in more than one encoding. 331can be served in more than one encoding.
327 332
328HTTP allows specifying a list of MIME charsets which indicate your 333HTTP allows specifying a series of MIME charsets which indicate your
329preferred character set encodings, e.g.@: Latin-9 or Big5, and these 334preferred character set encodings, e.g., Latin-9 or Big5, and these
330can be weighted. This list is generated automatically from the list 335can be weighted. The default series is generated automatically from
331of defined coding systems which have associated MIME types. These are 336the associated MIME types of all defined coding systems, sorted by the
332sorted by coding priority. @xref{Recognize Coding, , Recognizing 337coding system priority specified in Emacs. @xref{Recognize Coding, ,
333Coding Systems, emacs, The GNU Emacs Manual}. 338Recognizing Coding Systems, emacs, The GNU Emacs Manual}.
334@end defopt 339@end defopt
335 340
336@defopt url-mime-language-string 341@defopt url-mime-language-string
337@cindex language preferences 342@cindex language preferences
338A string specifying the preferred language when servers can serve 343A string specifying the preferred language when servers can serve
339files in several languages. Use RFC 1766 abbreviations, e.g.@: 344files in several languages. Use RFC 1766 abbreviations, e.g.,
340@samp{en} for English, @samp{de} for German. It can be a 345@samp{en} for English, @samp{de} for German.
341comma-separated list in descending order of preference. The ordering 346
342can be made explicit using `q' factors defined by HTTP, e.g.@: 347The string can be @code{"*"} to get the first available language (as
343@w{@samp{de, en-gb;q=0.8, en;q=0.7}}. It can be @samp{*} to get the 348opposed to the default).
344first available language (as opposed to the default).
345@end defopt 349@end defopt
346 350
347@node HTTP URL Options 351@node HTTP URL Options