Use conventional capitalization of Web and Internet

marijnh · marijnh · commit 6041aebe98a1 · 2014-04-08T21:45:50.000+02:00
diff --git a/00_intro.txt b/00_intro.txt
@@ -280,12 +280,12 @@ compose these blocks.
 == What is JavaScript? ==
 
 indexsee:[WWW,World Wide Web]
-indexsee:[web,World Wide Web]
+indexsee:[Web,World Wide Web]
 (((JavaScript)))(((JavaScript,history of)))(((World Wide Web)))
-JavaScript was introduced in 1995, as a way to add programs to web
+JavaScript was introduced in 1995, as a way to add programs to Web
 pages in the Netscape Navigator browser. The language has since been
 adapted by all other major graphical web browsers. It has made the
-current generation of web applications possible—browser-based email
+current generation of Web applications possible—browser-based email
 clients, maps, and social networks—and is also used in more
 traditional sites to provide various forms of interactivity and
 cleverness.
diff --git a/02_program_structure.txt b/02_program_structure.txt
@@ -224,13 +224,13 @@ number or different types of arguments.
 The `alert` function can be useful as an output device when
 experimenting, but clicking away all those little windows will get on
 your nerves. In past examples, we've used `console.log` to
-output values. Most JavaScript systems (including all modern web
+output values. Most JavaScript systems (including all modern Web
 browsers and node.js) provide a `console.log` function that writes out
 its arguments to _some_ text output device. In browsers, the output
 lands in the JavaScript console. This part of the browser interface
 is hidden by default, but most browsers open it when you press F12.
 If that does not work, search through the menus for an item named
-“web console” or “developer tools”.
+“Web console” or “developer tools”.
 
 ifdef::html_target[]
 
@@ -308,7 +308,7 @@ prompt("Tell me everything you know.", "...");
 
 image::img/prompt.png[alt="An prompt dialog"]
 
-These two functions aren't used much in modern web programming, mostly
+These two functions aren't used much in modern Web programming, mostly
 because you have no control over the way the resulting windows look,
 but they are very useful for toy programs and experiments.
 
diff --git a/04_data.txt b/04_data.txt
@@ -35,7 +35,7 @@ The online coding sandbox for the book (`eloquentjavascript.net/code`)
 will automatically load the needed code when you are running a
 specific example. If you decide to work through the examples in
 another environment, be sure to start from the full code for this
-chapter (`04_data.js`, available from the web site).
+chapter (`04_data.js`, available from the website).
 
 endif::tex_target[]
 
diff --git a/05_higher_order.txt b/05_higher_order.txt
@@ -399,7 +399,7 @@ allowed.
 
 This format is called JSON, pronounced “Jason”, which stands for
 JavaScript Object Notation. It is widely used as a data storage and
-communication format on the web.
+communication format on the Web.
 
 JavaScript provides two functions, `JSON.stringify` and `JSON.parse`,
 that convert data from and to this format.
diff --git a/08_error.txt b/08_error.txt
@@ -276,7 +276,7 @@ program to pause every time the line with the breakpoint is reached,
 and allowing you to inspect the values of variables at that point. I
 won't go into the interface to this debugger, since it differs per
 browser and browser version, but look around in the developer tools,
-and search the web. An alternative way to set a breakpoint is by
+and search the Web. An alternative way to set a breakpoint is by
 including a `debugger` statement (consisting of simply that keyword)
 in your program. Whenever that is reached, if the developer tools of
 the browser are active, the program will pause, and you will be able
diff --git a/10_modules.txt b/10_modules.txt
@@ -298,13 +298,13 @@ about those dependencies, making it harder to accidentally use some
 module without stating that you need it.
 
 Our goal is a function `require` which, when given a module name, will
-load that file (from disk or the web, depending on the platform
+load that file (from disk or the Web, depending on the platform
 we are running on), and return the appropriate interface value.
 
 For this we need at least two things. Firstly, we will imagine that we
 have a function `readFile` (which is not present in standard
 JavaScript), which returns the content of the file with the given
-name. There are ways to access the web from JavaScript in the browser,
+name. There are ways to access the Web from JavaScript in the browser,
 and to access the hard disk from other JavaScript platforms, but they
 are more involved. For now, we just pretend we have this simple
 function.
@@ -458,7 +458,7 @@ and “globally” registered module names.
 
 Though it is possible to use the style above in JavaScript written for
 the browser, it is somewhat involved. The reason for this is that
-reading a file (module) from the web is a lot slower than reading it
+reading a file (module) from the Web is a lot slower than reading it
 from your hard disk. Browser JavaScript is required to behave in such
 a way that, while a script is running, nothing else can happen to the
 web site in which it runs. This means that if every require call would
diff --git a/12_browser.txt b/12_browser.txt
@@ -32,7 +32,7 @@ developed means that the resulting system is not exactly a shining
 example of internal consistency. In fact, some parts of it are
 downright messy and confusing.
 
-== Networks and the internet ==
+== Networks and the Internet ==
 
 Computer networks have been known since the 1950s. If you put cables
 between two or more computers, and allow them to send data back and
@@ -71,7 +71,7 @@ technical problem.
 
 TCP (_Transmission Control Protocol_) is a protocol that solves this
 problem. All internet-connected devices “speak” it, and it is used as
-infrastructure for most communication on the internet.
+infrastructure for most communication on the Internet.
 
 A TCP connection works as follows: one computer must be waiting,
 “listening”, for other computers to start talking to it. To be able to
@@ -94,16 +94,16 @@ successfully transmitted, be read out again by the machine on the
 other side. This is a very convenient model. You could say that TCP
 provides an abstraction of the network.
 
-== The web ==
+== The Web ==
 
-The _World Wide Web_ (not to be confused with the internet as a whole)
+The _World Wide Web_ (not to be confused with the Internet as a whole)
 is a set of protocols and formats that allow us to open web pages in a
-browser. The “web” part in the name refers to the fact that such pages
+browser. The “Web” part in the name refers to the fact that such pages
 can easily link to each other, thus forming one huge, interconnected
 system that users can effortlessly move through.
 
-To add content to this web, all that is needed is to connect a machine
-to the internet, and have it listen on port 80, using HTTP (the
+To add content to this Web, all that is needed is to connect a machine
+to the Internet, and have it listen on port 80, using HTTP (the
 _Hyper-Text Transfer Protocol_). This protocol allows other computers
 to request documents over the network.
 
@@ -122,7 +122,7 @@ opposed to for example, secure, encrypted HTTP, which would be
 should have the document. And finally, after that, a string that
 identifies the actual document we are interested in.
 
-Each machine connected to the internet gets a unique address (its _IP
+Each machine connected to the Internet gets a unique address (its _IP
 address_), which will look something like `37.187.37.82`. You can use
 those directly as the server part of a URL, but lists of more or less
 random numbers are hard to remember and awkward to type, so it is
@@ -292,13 +292,13 @@ program harder to read.
 
 == In the sandbox ==
 
-Running programs downloaded off the internet is potentially dangerous.
+Running programs downloaded off the Internet is potentially dangerous.
 You do not know much about the people behind most sites you visit, so
 you can not necessarily know that they mean well. Running programs by
 people who do not mean well is how you get your computer infected by
 viruses, your data stolen, and your accounts hacked.
 
-Yet the attraction of the web is that you can “surf” it without
+Yet the attraction of the Web is that you can “surf” it without
 trusting all the pages you visit. This is why browsers severely limit
 the things a JavaScript program may do. It is not allowed to look at
 the files on your computer or to modify anything not related to the
@@ -328,12 +328,12 @@ government or mafia).
 
 == Compatibility and the browser wars ==
 
-In the very early stages of the web, a browser called Mosaic dominated
+In the very early stages of the Web, a browser called Mosaic dominated
 the market. After a few years, the balance had shifted to Netscape,
 which was then, in turn, largely superseded by Microsoft's Internet
 Explorer. At any point where a single browser was dominant, that
 browser's vendor would feel entitled to unilaterally invent new
-features for the web. Since most users used the same browser, web
+features for the Web. Since most users used the same browser, web
 sites would simply start using those features, never mind the other
 browsers.
 
@@ -359,7 +359,7 @@ latest versions of the major browsers behave quite uniformly, and have
 relatively little bugs.
 
 Which is not to say that the situation is perfect just yet. Some of
-the people using the web are, for reasons of inertia or corporate
+the people using the Web are, for reasons of inertia or corporate
 policy, stuck with very old browsers. Until those die out entirely,
 writing web sites that work for them will require a lot of arcane
 knowledge about their shortcomings and quirks.
diff --git a/14_event.txt b/14_event.txt
@@ -640,7 +640,7 @@ order of magnitude harder.
 The fact that JavaScript programs only do one thing at a time thus
 makes our life quite a bit easier. For when you really do want to do
 some time-consuming thing in the background, without freezing the
-document, browsers provide something called “web workers”. A worker is
+document, browsers provide something called _Web Workers_. A worker is
 an isolated JavaScript environment, which runs alongside the main
 program for a document, and can only communicate with it by sending
 and receiving messages.
