diff options
| author | Lukas Larsson <[email protected]> | 2014-09-10 11:32:29 +0200 |
|---|---|---|
| committer | Lukas Larsson <[email protected]> | 2014-09-10 11:32:29 +0200 |
| commit | a61e5a8f18ff0cb93adc9858cb8a7ca1bc6f8e1f (patch) | |
| tree | 52a00daf1e9297d34d2768493ce8f5d91a1d219a /lib | |
| parent | 89aa1c791f9a6775b4d452f7725791dbdcbc3876 (diff) | |
| parent | daa9e1a0d97612f6689685e5a597375ceb9e7b81 (diff) | |
| download | otp-a61e5a8f18ff0cb93adc9858cb8a7ca1bc6f8e1f.tar.gz otp-a61e5a8f18ff0cb93adc9858cb8a7ca1bc6f8e1f.tar.bz2 otp-a61e5a8f18ff0cb93adc9858cb8a7ca1bc6f8e1f.zip | |
Merge branch 'maint'
* maint:
Fix some spelling misstakes
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/inets/doc/src/httpd.xml | 10 | ||||
| -rw-r--r-- | lib/ose/doc/src/ose_intro.xml | 4 |
2 files changed, 7 insertions, 7 deletions
diff --git a/lib/inets/doc/src/httpd.xml b/lib/inets/doc/src/httpd.xml index 3830b2e5ab..4ca038cc99 100644 --- a/lib/inets/doc/src/httpd.xml +++ b/lib/inets/doc/src/httpd.xml @@ -139,7 +139,7 @@ <marker id="prop_server_root"></marker> <tag>{server_root, path()} </tag> <item> - <p>Defines the servers home directory where log files etc can + <p>Defines the server's home directory where log files etc can be stored. Relative paths specified in other properties refer to this directory. </p> </item> @@ -904,7 +904,7 @@ bytes <p>Fetches information about the HTTP server. When called with only the pid all properties are fetched, when called with a list of specific properties they are fetched. - Available properties are the same as the servers start options. + Available properties are the same as the server's start options. </p> <note><p>Pid is the pid returned from inets:start/[2,3]. @@ -930,7 +930,7 @@ bytes <p>Fetches information about the HTTP server. When called with only the Address and Port all properties are fetched, when called with a list of specific properties they are fetched. - Available properties are the same as the servers start + Available properties are the same as the server's start options. </p> @@ -956,7 +956,7 @@ bytes server. Incoming requests will be answered with a temporary down message during the time the it takes to reload.</p> - <note><p>Available properties are the same as the servers + <note><p>Available properties are the same as the server's start options, although the properties bind_address and port can not be changed.</p></note> @@ -1068,7 +1068,7 @@ bytes <type> <v>OldData = list()</v> <v>NewData = [{response,{StatusCode,Body}}] | [{response,{response,Head,Body}}] | [{response,{already_sent,Statuscode,Size}}] </v> - <v>StausCode = integer()</v> + <v>StatusCode = integer()</v> <v>Body = io_list() | nobody | {Fun, Arg}</v> <v>Head = [HeaderOption]</v> <v>HeaderOption = {Option, Value} | {code, StatusCode}</v> diff --git a/lib/ose/doc/src/ose_intro.xml b/lib/ose/doc/src/ose_intro.xml index b5e3ef8b33..0ed470890b 100644 --- a/lib/ose/doc/src/ose_intro.xml +++ b/lib/ose/doc/src/ose_intro.xml @@ -65,7 +65,7 @@ erl /home/erlang --</code> <p> - The arguments are printed on seperate lines to make it possible to know + The arguments are printed on separate lines to make it possible to know what has to be quoted with ". Each line is one quotable unit. So taking the arguments above you can supply them to pm_create or just execute directly on the command line. For example:</p> @@ -75,7 +75,7 @@ pid: 0x110059 rtose@acp3400> pm_start 0x110059</code> <p> Also note that since we are running erl to figure out the arguments on a - seperate machine the paths have to be updated. In the example above + separate machine the paths have to be updated. In the example above <c>/usr/local/lib/erlang</c> was replaced by <c>/mst/erlang/</c>. The goal is to in future releases not have to do the special argument handling but for now (OTP 17.0) you have to do it. |