Skip to content

Commit 9b71f4c

Browse files
authored
Merge pull request #120 from AndrewDawes/fix_typos
Fixed several typos
2 parents 3ff246d + d6eb35c commit 9b71f4c

File tree

5 files changed

+6
-6
lines changed

5 files changed

+6
-6
lines changed

Content/Part 1/2-b2-cafelog.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ The article also highlights something important: people liked using b2. With b2
4747

4848
But people did find it easy to use. To users, it didn't matter what was going on under the hood. It may have had its problems, but it was a friction-free way to get content online. Where users went, developers followed; even better if those users were novice developers themselves, fumbling at the edges of PHP, learning what they could do with code, which new features they could add to their website and share with other users. Even in these very early days, a schism started to open between developer-focused development and user-focused development. On the one hand, there was a focus on logical, beautifully written code, and on the other, a focus on features users wanted.
4949

50-
Despite having distributed b2, Michel hesistated over his choice of license. The free software movement was relatively young, and many large projects had their own licensing terms (such as Apache, PHP, and X.Org). Until he chose a license, Michel distributed b2 with his copyright.
50+
Despite having distributed b2, Michel hesitated over his choice of license. The free software movement was relatively young, and many large projects had their own licensing terms (such as Apache, PHP, and X.Org). Until he chose a license, Michel distributed b2 with his copyright.
5151

5252
On the b2 blog, you can follow the events leading to b2’s distribution with a GPL license. In August 2001, Michel made a brief statement on cafelog.com, telling people that they could use his code provided he was given credit for it, stating explicitly that "b2 isn't released under the GPL yet." People were taking notice of b2 and some passed it off as their own. In October 2001, a Norwegian agency claimed to own the copyright to b2 and Michel was forced to contact the Norwegian copyright agency. In the discussion around this incident, Michel made a statement that came as close to a license as he'd had so far:
5353
<blockquote>You can use b2 for free, even if your site is of commercial nature. You're welcomed to buy me items from my Amazon.com wishlist if you're going to make much money from your b2-powered site or if you just like b2.

Content/Part 3/21-wordcamp-2006.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,15 @@ The WordPress community has a long tradition of getting together to have fun and
44

55
Matt, along with Tantek Çelik, had helped organize an informal technology conference called BarCamp, a series of open, workshop-style events where attendees helped create the schedule. In July 2006, Matt announced that he would host a BarCamp-style event called <a href="http://ma.tt/2006/07/wordcamp/">"WordCamp"</a> later that summer in San Francisco. "BarCamp-style" is a code phrase for 'last minute,'” <a href="http://ma.tt/2006/07/wordcamp/">he joked</a>.
66

7-
The event -- which he announced without a venue or schedule -- would be on August 5th. More than 500 people from all over the world registered: Donncha flew in from Ireland, and Mark Riley from the UK. When WordCamp did get a venue, it was the Swedish American Hall, a Market Street house that served as headquarters for the Swedish Society of San Francsico.
7+
The event -- which he announced without a venue or schedule -- would be on August 5th. More than 500 people from all over the world registered: Donncha flew in from Ireland, and Mark Riley from the UK. When WordCamp did get a venue, it was the Swedish American Hall, a Market Street house that served as headquarters for the Swedish Society of San Francisco.
88

99
<a href="http://2006.wordcamp.org/schedule/">WordCamp 2006's schedule</a> reflects the project's concerns and its contributors' passions. Mark Riley gave the first-ever workshop on getting involved with the WordPress community, now a staple talk at WordCamps. Andy Skelton presented on the widgets feature that he was working on for WordPress.com. Donncha spoke about WPMU, and Mark Jaquith explored <a href="http://markjaquith.com/wordcamp/wordpress-versatility/">WordPress as a CMS</a>, <a href="http://markjaquith.wordpress.com/2006/08/30/wordcamp-thoughts-late-to-the-game/">one of the most-requested sessions</a>. There were presentations about blogging and podcasting, and about journalism and monetizing.
1010

1111
<img alt="WordCamp San Francisco 2006" src="../../Resources/images/21/wcsf_2006.jpg" width="800px" />
1212

1313
_The first WordCamp. (cc license Scott Beale ([Laughing Squid](http://laughingsquid.com)))_
1414

15-
WordCamp San Francisco 2006 also saw Matt's inaugural "State of the Word" presentation, in which he <a href="http://dan.hersam.com/2006/08/05/wordcamp-notes/">focused on keeping the software simple</a>, with streamlined installation and user-friendy theme and admin pages. He invited more people to contribute to documentation and support, highlighting Mark Riley's work, and discussed future updates in a Q&amp;A afterwards. This WordPress year-in-review and "coming soon" talk has been a feature of every WordCamp San Francisco since (and in 2015, of the first-ever WordCamp US in Philadelphia, Pennsylvania).
15+
WordCamp San Francisco 2006 also saw Matt's inaugural "State of the Word" presentation, in which he <a href="http://dan.hersam.com/2006/08/05/wordcamp-notes/">focused on keeping the software simple</a>, with streamlined installation and user-friendly theme and admin pages. He invited more people to contribute to documentation and support, highlighting Mark Riley's work, and discussed future updates in a Q&amp;A afterwards. This WordPress year-in-review and "coming soon" talk has been a feature of every WordCamp San Francisco since (and in 2015, of the first-ever WordCamp US in Philadelphia, Pennsylvania).
1616

1717
<img alt="State of the word 2006" src="../../Resources/images/21/wcsf_2006_sotw_matt.jpg" width="800px" />
1818

Content/Part 3/22-speeding-up-the-release-cycle.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
Shuttle wasn’t the only piece of the project that dragged. More than a year elapsed between Shuttle-inspired WordPress 2.0 and the next version, WordPress 2.1. <a href="http://ma.tt/2010/11/one-point-oh/">Matt describes</a> the period as “a dark time in WordPress development history, a lost year.” It was time for a streamlined development process.
66

7-
WordPress' approach to new versions gives each major release two numbers: 1.5, 2.0, 2.9, 3.4, 4.0. Patch releases get an additional decimal point (2.0.1, for example). Many other software projects, like Drupal, give each major release a round number; over a period of years, the version number climbs. Decimalization avoids that, althought it took WordPress a while to settle on regular numbering.
7+
WordPress' approach to new versions gives each major release two numbers: 1.5, 2.0, 2.9, 3.4, 4.0. Patch releases get an additional decimal point (2.0.1, for example). Many other software projects, like Drupal, give each major release a round number; over a period of years, the version number climbs. Decimalization avoids that, although it took WordPress a while to settle on regular numbering.
88

99
The release cycle was sporadic in the early days. Version numbers jumped haphazardly. Some releases arrived in a few months, while 265 days went by between 1.2 and 1.5 -- the codebase had so many changes that WordPress skipped the interim version numbers, <a href="http://wordpress.org/news/2004/12/version-skip/">going straight from 1.2 to 1.5</a>. Version 1.6 was inflated to 2.0, because of the number of features in it and because 314 days had elapsed between the releases. But the delay between 2.0 (released December 31, 2005) and 2.1 (released January 22, 2007) was the longest to date.
1010

Content/Part 5/36-wordpress-3-0.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ However, Jeffrey found the time difference challenging. Jeffrey is based in Sou
3434

3535
An environment in which everyone had a voice and an opinion wasn’t something that WooThemes was used to in their development process. Adii Pienaar, co-founder of WooThemes, described the process as excruciating. One of the main points of contention was that WooThemes had originally put the menus in the center of the screen with boxes to add menu items on the right-hand side. WooThemes had invested time into designing it that way, but the <a href="http://make.wordpress.org/core/2010/02/25/menus-ux-manifesto/">menu interface was flipped around</a> to match WordPress’ left to right interface convention.
3636

37-
The menu integration was one of the first times that the project had worked directly with a commercial business (other than Automattic). While the process was not always completely smooth, both sides benefitted from collaborating. WordPress got its menu system. While not exactly the same as the menu system that WooThemes created, it accelerated development. WooThemes got the satisfaction of seeing its code used by every WordPress user. <a href="http://wptavern.com/woothemes-has-and-will-continue-to-get-credit">Not everyone felt that WooThemes received adequate credit</a>, though Jeff didn't share this viewpoint. “Just to have our name on the contributors' wall -- that to me was good enough,” <a href="http://archive.wordpress.org/interviews/2014_06_06_Pearce.html#L47">he says</a>. “It’s nice just to be able to say, I built a part of WordPress. No one can ever take that away from me. That was recognition enough for me.”
37+
The menu integration was one of the first times that the project had worked directly with a commercial business (other than Automattic). While the process was not always completely smooth, both sides benefited from collaborating. WordPress got its menu system. While not exactly the same as the menu system that WooThemes created, it accelerated development. WooThemes got the satisfaction of seeing its code used by every WordPress user. <a href="http://wptavern.com/woothemes-has-and-will-continue-to-get-credit">Not everyone felt that WooThemes received adequate credit</a>, though Jeff didn't share this viewpoint. “Just to have our name on the contributors' wall -- that to me was good enough,” <a href="http://archive.wordpress.org/interviews/2014_06_06_Pearce.html#L47">he says</a>. “It’s nice just to be able to say, I built a part of WordPress. No one can ever take that away from me. That was recognition enough for me.”
3838

3939
WordPress 3.0 ended up being a huge release, and while menu discussion continued, launch was delayed again and again. By April, the core team was still sending around wireframes -- <a href="https://irclogs.wordpress.org/chanlog.php?channel=wordpress-dev&amp;day=2010-04-15&amp;sort=asc#m109848">discussing whether menus should be pulled from 3.0</a>. The <a href="http://make.wordpress.org/core/version-3-0-project-schedule/">release candidate kept being pushed back</a>. Matt <a href="http://make.wordpress.org/core/2010/04/20/deadlines-are-not-arbritrary-theyre-a/">reiterated one of WordPress’ key philosophies</a>:
4040

Content/introduction.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ Reading through the blog archives is like touring the history of the modern web
8484

8585
But there's more to Jeffrey's blog than musings about the web. While he was still hand-coding his website, Jeffrey started a section called “My Glamorous Life,” where he [wrote about himself](http://www.zeldman.com/glamorous/glamorous.html). The tag “glamorous” is still what he uses to tag posts that are about him, rather than about someone else. As with all diarists, there's a lot we can learn about Jeffrey: He’s a web designer who cares passionately about web standards. He’s a publisher and an event organizer. He hosts a regular podcast called “The Big Web Show.” But there’s more than just what he _does_. He has a daughter named Ava. He's long been divorced, but still looks after his ex's two small dogs when she is ill (much to the annoyance of his neighbors). He has family secrets that, now and again, come out of the closet. He’s a fan of Edward Hopper and John Coltrane. He surrounds himself by smart people he respects. He loves what he does and he wants you to like it too.
8686

87-
This blending of the personal and the professional is the mark of many blogs. After all, for the writer, these things are just different aspects of who they are. "I don't really see a big difference between sharing what's personal and sharing opinions about web design and sharing information about web design," Jeffrey says. "It's all the same." He continues in the same fashion today, blogging on WordPress about the web, sharing news about his different projects, and telling stories from his glamourous life.
87+
This blending of the personal and the professional is the mark of many blogs. After all, for the writer, these things are just different aspects of who they are. "I don't really see a big difference between sharing what's personal and sharing opinions about web design and sharing information about web design," Jeffrey says. "It's all the same." He continues in the same fashion today, blogging on WordPress about the web, sharing news about his different projects, and telling stories from his glamorous life.
8888

8989
**Giving People a Voice**
9090
_Worldwide_

0 commit comments

Comments
 (0)