Index: src/en/book/ch08-embedding-svn.xml =================================================================== --- src/en/book/ch08-embedding-svn.xml (revisjon 3273) +++ src/en/book/ch08-embedding-svn.xml (arbeidskopi) @@ -310,8 +310,7 @@ The difference here is that the Subversion filesystem has a nifty third dimension that most filesystems do not - have—Time! - + have—Time! We understand that this may come as a shock to sci-fi fans who have long been under the impression that Time was actually the fourth dimension, and we @@ -753,8 +752,7 @@ document contains useful information, which, while aimed at developers and would-be developers of Subversion itself, is equally applicable to folks developing against Subversion as a - set of third-party libraries. - + set of third-party libraries. After all, Subversion uses Subversion's APIs, too. @@ -782,8 +780,7 @@ Win32, BeOS, OS/2, and Mac OS X. In addition to providing consistent implementations of - system calls that differ across operating systems, - + system calls that differ across operating systems, Subversion uses ANSI system calls and datatypes as much as possible. @@ -795,8 +792,7 @@ apr_pool_t—the APR memory pool. Subversion uses pools internally for all its memory allocation needs (unless an external library requires a different memory - management mechanism for data passed through its API), - + management mechanism for data passed through its API), Neon and Berkeley DB are examples of such libraries. and while a person coding against the Subversion APIs is not Index: src/en/book/appc-webdav.xml =================================================================== --- src/en/book/appc-webdav.xml (revisjon 3273) +++ src/en/book/appc-webdav.xml (arbeidskopi) @@ -379,8 +379,7 @@ On Windows, several well-known applications contain integrated WebDAV client functionality, such as - Microsoft's Office, - + Microsoft's Office, WebDAV support was removed from Microsoft Access for some reason, but it exists in the rest of the Office suite. Index: src/en/book/ch00-preface.xml =================================================================== --- src/en/book/ch00-preface.xml (revisjon 3273) +++ src/en/book/ch00-preface.xml (arbeidskopi) @@ -454,8 +454,7 @@ a risky and ambitious new open source project; Jim Blandy for the original Subversion name and design—we love you, Jim; and Karl Fogel for being such a good friend and a great - community leader, in that order. - + community leader, in that order. Oh, and thanks, Karl, for being too overworked to write this book yourself. @@ -806,8 +805,7 @@ changing at all. The collection itself grows over time, but the individual files within the collection aren't being changed. In this case, using Subversion - is overkill. - + is overkill. Or as a friend puts it, swatting a fly with a Buick. Index: src/en/book/ch09-reference.xml =================================================================== --- src/en/book/ch09-reference.xml (revisjon 3273) +++ src/en/book/ch09-reference.xml (arbeidskopi) @@ -16,8 +16,7 @@ The Subversion Command-Line Client: <command>svn</command> To use the command-line client, type - svn, the subcommand you wish to use, - + svn, the subcommand you wish to use, Well, you don't need a subcommand to use the option, but we'll get to that in just a minute. @@ -5572,8 +5571,7 @@ Create a new, empty repository at the path provided. If the provided directory does not exist, it will be - created for you. - + created for you. Remember, svnadmin works only with local paths, not URLs. @@ -9202,8 +9200,7 @@ If present on a file, indicates that the file is not an ordinary file, but a symbolic link or other special - object. - + object. As of this writing, symbolic links are indeed the only special objects. But there might be more in future releases of Index: src/en/book/ch03-advanced-topics.xml =================================================================== --- src/en/book/ch03-advanced-topics.xml (revisjon 3273) +++ src/en/book/ch03-advanced-topics.xml (arbeidskopi) @@ -504,8 +504,7 @@ (:), or an underscore (_); after that, you can also use digits, hyphens (-), and periods - (.). - + (.). If you're familiar with XML, this is pretty much the ASCII subset of the syntax for XML "Name". @@ -634,8 +633,7 @@ simply provide the URL of any path in the repository of interest (including the repository's root URL). For example, you might want to replace the commit log message of an - existing revision. - + existing revision. Fixing spelling errors, grammatical gotchas, and just-plain-wrongness in commit log messages is perhaps the most common use case for the @@ -939,8 +937,7 @@ change didn't occur overnight—there was certainly a period of confusion for computer users over what exactly they had in hand when they saw a .DOC - file. - + file. You think that was rough? During that same era, WordPerfect also used .DOC for their proprietary file format's preferred extension! @@ -1043,8 +1040,7 @@ This property has no effect on filesystems that have no concept of an executable permission bit, such as FAT32 and - NTFS. - + NTFS. The Windows filesystems use file extensions (such as .EXE, .BAT, and .COM) to denote executable @@ -1411,8 +1407,7 @@ from your source code, a source file named data.c, and a set of debugging output logfiles. Now, you know that your build system always results in - the calculator program being generated. - + the calculator program being generated. Isn't that the whole point of a build system? And you know that your test suite always leaves those debugging @@ -1631,8 +1626,7 @@ nothing special. Subversion will never attempt to perform textual substitutions on your file contents unless explicitly asked to do so. After all, you might be writing - a document - + a document … or maybe even a section of a book … about how to use keywords, and you don't want Subversion to @@ -2188,8 +2182,7 @@ windshield was already cracked. As is discussed in , most of these types of problems go away entirely where perfect communication - between Harry and Sally exists. - + between Harry and Sally exists. Communication wouldn't have been such bad medicine for Harry and Sally's Hollywood namesakes, either, for that matter. @@ -2219,8 +2212,7 @@ When referring to Subversion's locking feature, one is actually talking about a fairly diverse collection of behaviors, - which include the ability to lock a versioned file - + which include the ability to lock a versioned file Subversion does not currently allow locks on directories. (claiming the exclusive right to modify the file), to unlock @@ -2767,8 +2759,7 @@ users to edit and save the file anyway. There's not much that Subversion can do in this situation—at the end of the day, there's simply no substitution for good interpersonal - communication. - + communication. Except, perhaps, a classic Vulcan mind-meld. @@ -3137,8 +3128,7 @@ nascent software project you've been toying with. Eventually, though, that project matures to the point that the idea seems to actually have some wings, so you do the unthinkable and decide - to give the project a name. - + to give the project a name. You're not supposed to name it. Once you name it, you start getting attached to it.—Mike Wazowski @@ -3196,8 +3186,7 @@ peg revision, Subversion performs the requested operation using the operative revision(s). To map this to our Chicagoland streets analogy, if we are told to go to 606 N. Main Street in - Wheaton, - + Wheaton, 606 N. Main Street, Wheaton, Illinois, is the home of the Wheaton History Center. It seemed appropriate…. @@ -4075,8 +4064,7 @@ about branches, tags, and merging. Then you'll have nearly full mastery of the Subversion client. Though our lawyers won't allow us to promise you anything, this additional knowledge - could make you measurably more cool. - + could make you measurably more cool. No purchase necessary. Certains terms and conditions apply. No guarantee of coolness—implicit or otherwise—exists. Mileage may vary. Index: src/en/book/ch05-repository-admin.xml =================================================================== --- src/en/book/ch05-repository-admin.xml (revisjon 3273) +++ src/en/book/ch05-repository-admin.xml (arbeidskopi) @@ -21,8 +21,7 @@ role of a user whose data is under version control (i.e., via a Subversion client), you can skip this chapter altogether. However, if you are, or wish to become, a Subversion repository - administrator, - + administrator, This may sound really prestigious and lofty, but we're just talking about anyone who is interested in that mysterious realm beyond the working copy where everyone's @@ -220,8 +219,7 @@ like the fact that even though no changes have been made to their project lately, the youngest revision number for the repository keeps climbing because other projects are actively - adding new revisions. - + adding new revisions. Whether founded in ignorance or in poorly considered concepts about how to derive legitimate software development metrics, global revision numbers are a silly @@ -256,8 +254,7 @@ to create various named branches of the main development line; and tags, which is a collection of tree snapshots that are created, and perhaps destroyed, but never - changed. - + changed. The trunk, tags, and branches trio is sometimes referred to as the TTB directories. @@ -412,8 +409,7 @@ BDB-backed. The other type stores data in ordinary flat files, using a custom format. Subversion developers have adopted the habit of referring to this latter - data storage mechanism as FSFS - + data storage mechanism as FSFS Often pronounced fuzz-fuzz, if Jack Repenning has anything to say about it. (This book, however, assumes that the reader is thinking @@ -598,8 +594,7 @@ Windows 2000 or later. While Berkeley DB promises to behave correctly on - network shares that meet a particular set of specifications, - + network shares that meet a particular set of specifications, Berkeley DB requires that the underlying filesystem implement strict POSIX locking semantics, and more importantly, the ability to map files directly into @@ -722,8 +717,7 @@ The only real argument against FSFS is its relative immaturity compared to Berkeley DB. Unlike Berkeley DB, which has years of history, its own dedicated development - team, and, now, Oracle's mighty name attached to it, - + team, and, now, Oracle's mighty name attached to it, Oracle bought Sleepycat and its flagship software, Berkeley DB, on Valentine's Day in 2006. @@ -1249,8 +1243,7 @@ into another repository. And while there are few ways to do that, its primary strength is that it can operate remotely—the source and - sink - + sink Or is that, the sync? repositories may be on different computers from each other @@ -1717,8 +1710,7 @@ If this happens to your repository, don't panic. The Berkeley DB filesystem takes advantage of database transactions, checkpoints, and prewrite journaling to - ensure that only the most catastrophic of events - + ensure that only the most catastrophic of events For example, hard drive + huge electromagnet = disaster. can permanently destroy a database environment. A @@ -2101,8 +2093,7 @@ system), attempting manual tweaks is unwise if not quite difficult, and at any rate strongly discouraged. And once data has been stored in your repository, Subversion - generally doesn't provide an easy way to remove that data. - + generally doesn't provide an easy way to remove that data. That's rather the reason you use version control at all, right? @@ -2110,8 +2101,7 @@ manipulate the history of your repository. You might need to strip out all instances of a file that was accidentally added to the repository (and shouldn't be there for whatever - reason). - + reason). Conscious, cautious removal of certain bits of versioned data is actually supported by real use cases. That's why an obliterate feature has been @@ -2329,8 +2319,7 @@ svndumpfilter include and svndumpfilter exclude (and if they don't, you shouldn't). Further, if your dump file has an inconsistent - usage of leading slashes for some reason, - + usage of leading slashes for some reason, While svnadmin dump has a consistent leading slash policy (to not include them), other programs that generate dump data might @@ -2428,8 +2417,7 @@ histories contained in the source and target repositories. For this reason, while svnsync cannot demand that the target repository be - read-only, - + read-only, In fact, it can't truly be read-only, or svnsync itself would have a tough time copying revision history into it. @@ -2625,8 +2613,7 @@ And now comes the fun part. With a single subcommand, we can tell svnsync to copy all the as-yet-unmirrored revisions from the source repository to the - target. - + target. Be forewarned that while it will take only a few seconds for the average reader to parse this paragraph and the sample output that follows it, the actual time @@ -3026,8 +3013,7 @@ properties affect their backups. Since these changes do not themselves generate new revisions, they will not trigger post-commit hooks, and may not even trigger the - pre-revprop-change and post-revprop-change hooks. - + pre-revprop-change and post-revprop-change hooks. svnadmin setlog can be called in a way that bypasses the hook interface altogether. @@ -3061,8 +3047,7 @@ delicate balance of convenience with paranoia. And whatever you do, validate your backups from time to time—what good is a spare tire that has a hole in it? While all of this - might not save your hardware from the iron fist of Fate, - + might not save your hardware from the iron fist of Fate, You know—the collective term for all of her fickle fingers. Index: src/en/book/appb-svn-for-cvs-users.xml =================================================================== --- src/en/book/appb-svn-for-cvs-users.xml (revisjon 3273) +++ src/en/book/appb-svn-for-cvs-users.xml (arbeidskopi) @@ -363,8 +363,7 @@ the project's root URL. If you make the mistake of checking out the root of the project, you may very well wind up with a working copy that contains a complete copy of your project's - content for each and every one of its branches and tags. - + content for each and every one of its branches and tags. That is, providing you don't run out of disk space before your checkout finishes. Index: src/en/book/appa-quickstart.xml =================================================================== --- src/en/book/appa-quickstart.xml (revisjon 3273) +++ src/en/book/appa-quickstart.xml (arbeidskopi) @@ -74,8 +74,7 @@ Subversion repository in which it lives. Obviously, you'll need to already have a Subversion client on hand to do this. But once you do, you can check out a working copy of the Subversion source - repository from : - + repository from : Note that the URL checked out in the example ends not with svn, but with a subdirectory thereof called trunk. See our discussion of Index: src/en/book/ch06-server-configuration.xml =================================================================== --- src/en/book/ch06-server-configuration.xml (revisjon 3273) +++ src/en/book/ch06-server-configuration.xml (arbeidskopi) @@ -734,8 +734,7 @@ The svnserve server, by default, knows - only how to send a CRAM-MD5 - + only how to send a CRAM-MD5 See RFC 2195. authentication challenge. In essence, @@ -1175,8 +1174,7 @@ chapter). But even in the case of tunneling, you can still use the svnserve.conf file to block access, by simply setting auth-access = read - or auth-access = none. - + or auth-access = none. Note that using any sort of svnserve-enforced access control at all is a bit pointless; the user already has direct access to @@ -1188,8 +1186,7 @@ here, but it doesn't. Subversion allows you to create custom tunnel behaviors in your runtime config file (see .) For - example, suppose you want to use RSH instead of SSH. - + example, suppose you want to use RSH instead of SSH. We don't actually recommend this, since RSH is notably less secure than SSH. @@ -1398,8 +1395,7 @@ robust system that is conveniently packaged as part of the Apache 2.0 software, supported by numerous operating systems and third-party products, and doesn't require network - administrators to open up yet another custom port. - + administrators to open up yet another custom port. They really hate doing that. While an Apache-Subversion server has more features than @@ -1828,8 +1824,7 @@ some sort of SSL encryption, so that clients authenticate via https:// instead of http://; at a bare minimum, you can - configure Apache to use a self-signed server certificate. - + configure Apache to use a self-signed server certificate. While self-signed server certificates are still vulnerable to a man-in-the-middle attack, such an attack is much more difficult for a casual @@ -1981,8 +1976,7 @@ ssl-client-cert-file and ssl-client-cert-password variables, the Subversion client can automatically respond to a client - certificate challenge without prompting you. - + certificate challenge without prompting you. More security-conscious folk might not want to store the client certificate password in the runtime servers file. @@ -2361,8 +2355,7 @@ web browser, however, you can use third-party software. A good example of this is ViewVC (). ViewVC was originally - written to display CVS repositories through the Web, - + written to display CVS repositories through the Web, Back then, it was called ViewCVS. and the latest releases are able to understand Subversion @@ -2953,8 +2946,7 @@ administrator. Decide whether it's worth sacrificing some server speed, and remember that there's very little risk involved; it's bad to become dependent on technology as a - crutch for social problems. - + crutch for social problems. A common theme in this book! Index: src/en/book/ch04-branching-and-merging.xml =================================================================== --- src/en/book/ch04-branching-and-merging.xml (revisjon 3273) +++ src/en/book/ch04-branching-and-merging.xml (arbeidskopi) @@ -183,12 +183,11 @@ repository, creating a new directory in revision 341. The new directory is a copy of /calc/trunk. This is shown in - . - - Subversion does not support copying between different - repositories. When using URLs with svn - copy or svn move, you can only - copy items within the same repository. + . + Subversion does not support copying between different + repositories. When using URLs with svn + copy or svn move, you can only + copy items within the same repository. While it's also possible to create a branch by @@ -1035,8 +1034,7 @@ information. Revisions are immutable trees that build upon one another. Removing a revision from history would cause a domino effect, creating chaos in all subsequent revisions and - possibly invalidating all working copies. - + possibly invalidating all working copies. The Subversion project has plans, however, to someday implement a command that would accomplish the task of permanently deleting information. In the meantime, see @@ -1329,8 +1327,7 @@ interactively for the merge process to continue and apply the second range of changes. If you postpone a conflict from the first wave of changes, the whole merge - command will bail out with an error message. - + command will bail out with an error message. At least, this is true in Subversion 1.5 at the time of this writing. This behavior may improve in future versions of Subversion. @@ -1535,8 +1532,7 @@ undo a change to an object's personal history (e.g., commit r5 to the trunk, then immediately roll back r5 using svn merge . -c -5), this - sort of merge doesn't affect the recorded mergeinfo. - + sort of merge doesn't affect the recorded mergeinfo. Interestingly, after rolling back a revision like this, we wouldn't be able to reapply the revision using svn merge . -c 5, @@ -2173,8 +2169,7 @@ mixture of repository locations, these locations must all be within the same repository. Subversion repositories aren't yet able to communicate with one another; - that feature is planned for the future. - + that feature is planned for the future. You can, however, use svn switch with the option if the URL of your server changes and you don't want to @@ -2894,8 +2889,7 @@ includes a copy of the first vendor drop—and we get to work customizing the libcomplex code. Before we know it, our modified version of libcomplex is now completely integrated - into our calculator program. - + into our calculator program. And is entirely bug-free, of course! Index: src/en/book/ch02-basic-usage.xml =================================================================== --- src/en/book/ch02-basic-usage.xml (revisjon 3273) +++ src/en/book/ch02-basic-usage.xml (arbeidskopi) @@ -326,8 +326,7 @@ authentication credentials on disk. This is done for convenience so that you don't have to continually reenter your password for future operations. If you're concerned - about caching your Subversion passwords, - + about caching your Subversion passwords, Of course, you're not terribly worried—first because you know that you can't really delete anything from @@ -570,8 +569,7 @@ deleted, but Subversion schedules it for deletion. When you commit your changes, foo will be entirely removed from your working copy and the - repository. - + repository. Of course, nothing is ever totally deleted from the repository—just from the HEAD of the repository. You can @@ -678,8 +676,7 @@ network. This makes it easy to manage your changes-in-progress when you are somewhere without a network connection, such as traveling on an airplane, riding a - commuter train, or hacking on the beach. - + commuter train, or hacking on the beach. And you don't have a WLAN card. Thought you got us, huh? @@ -1512,8 +1509,7 @@ surprised when the sandwich arrives and it's not what she wanted. This is where you pick up the phone or walk across the office and explain to Sally that you can't get - sauerkraut from an Italian deli. - + sauerkraut from an Italian deli. And if you ask them for it, they may very well ride you out of town on a rail. @@ -2135,8 +2131,7 @@ In addition to all of the previous commands, you can use svn update and svn checkout with the option - to take an entire working copy back in time: - + to take an entire working copy back in time: See? We told you that Subversion was a time machine. Index: src/en/book/ch07-customizing-svn.xml =================================================================== --- src/en/book/ch07-customizing-svn.xml (revisjon 3273) +++ src/en/book/ch07-customizing-svn.xml (arbeidskopi) @@ -56,8 +56,7 @@ profile directory (which, by the way, is usually a hidden directory). However, on this platform, the exact location differs from system to system and is dictated by the Windows - Registry. - + Registry. The APPDATA environment variable points to the Application Data area, so you can always refer to this folder as @@ -572,8 +571,7 @@ linkend="svn.serverconfig.svnserve.sshauth"/>. The miscellany section is where - everything that doesn't belong elsewhere winds up. - + everything that doesn't belong elsewhere winds up. Anyone for potluck dinner? In this section, you can find: @@ -1151,8 +1149,7 @@ simultaneously. Finally, Subversion expects that your program return an error code of 1 if your program detected differences, or 0 if it did not—any other error code is considered a - fatal error. - + fatal error. The GNU diff manual page puts it this way: An exit status of 0 means no differences were found, 1 means some differences were found, and 2 means trouble.