From 8ecfa07384512fddf82fea3f8f15e40226489931 Mon Sep 17 00:00:00 2001 From: "Benj. Mako Hill" Date: Sat, 4 Jun 2005 00:08:42 +0000 Subject: [PATCH 1/1] A final revision making some changes in linktext and making forking Author: mako Date: 2001/04/10 13:21:56 A final revision making some changes in linktext and making forking its own section so it doesn't seem like its just another section on branching. I changed a little bit of the text of the forking section to try and reflect this organizational change. --- FreeSoftwareDevelopmentHOWTO.sgml | 50 ++++++++++++++++--------- FreeSoftwareProjectManagementHOWTO.sgml | 50 ++++++++++++++++--------- TODO | 14 ++----- 3 files changed, 67 insertions(+), 47 deletions(-) diff --git a/FreeSoftwareDevelopmentHOWTO.sgml b/FreeSoftwareDevelopmentHOWTO.sgml index d85158d..6d4bd70 100644 --- a/FreeSoftwareDevelopmentHOWTO.sgml +++ b/FreeSoftwareDevelopmentHOWTO.sgml @@ -17,6 +17,13 @@ + + + v0.2.1 + 10 April 2001 + bch + + @@ -250,6 +257,13 @@ In this version I have the pleasure of acknowledging: + + Josh Crawford, Andy King, and Jaime Davila who all read through + this beast and gave me feedback that has helped me make changes + and improvements to this document. I can't thank you guys enough + for your help. + + Karl Fogel, the author of Open Source Development with CVS published by the Coriolis @@ -393,11 +407,10 @@ Identify and articulate your idea Eric S. Raymond writes about how free software projects start in - his essay, The Cathedral and the Bazaar, which - comes as required reading for any free software developer. It is - available online - . + his essay, The + Cathedral and the Bazaar, which comes as required + reading for any free software developer. It is available online . @@ -754,8 +767,9 @@ The text of the GPL offers a good - description of mechanics of applying a license to a piece - of software. My quick checklist for applying a license includes: + description of the mechanics of applying a license to a + piece of software. My quick checklist for applying a license + includes: @@ -1946,18 +1960,19 @@ pages for more information and options. freeze in effect. + - - Forking + + Forks - Forks are like the most extreme version of a branch. A fork is - when a group of developers takes code from a free software - project and actually starts a brand new free software - project with it. The most famous example of a fork was between Emacs and - XEmacs. Both emacsen are based on an identical code-base - but for technical, political, and philosophical reasons, - development was split into two projects which now compete with - each other. + I wasn't sure about how I would deal with forking in this + document (or if I would deal with forking at all). A fork is when + a group of developers takes code from a free software project and + actually starts a brand new free software project with it. The + most famous example of a fork was between Emacs and XEmacs. Both + emacsen are based on an identical code-base but for technical, + political, and philosophical reasons, development was split into + two projects which now compete with each other. @@ -1977,7 +1992,6 @@ pages for more information and options. absolutely unresolvable, I recommend Fogel's book as a good place to start. - diff --git a/FreeSoftwareProjectManagementHOWTO.sgml b/FreeSoftwareProjectManagementHOWTO.sgml index d85158d..6d4bd70 100644 --- a/FreeSoftwareProjectManagementHOWTO.sgml +++ b/FreeSoftwareProjectManagementHOWTO.sgml @@ -17,6 +17,13 @@ + + + v0.2.1 + 10 April 2001 + bch + + @@ -250,6 +257,13 @@ In this version I have the pleasure of acknowledging: + + Josh Crawford, Andy King, and Jaime Davila who all read through + this beast and gave me feedback that has helped me make changes + and improvements to this document. I can't thank you guys enough + for your help. + + Karl Fogel, the author of Open Source Development with CVS published by the Coriolis @@ -393,11 +407,10 @@ Identify and articulate your idea Eric S. Raymond writes about how free software projects start in - his essay, The Cathedral and the Bazaar, which - comes as required reading for any free software developer. It is - available online - . + his essay, The + Cathedral and the Bazaar, which comes as required + reading for any free software developer. It is available online . @@ -754,8 +767,9 @@ The text of the GPL offers a good - description of mechanics of applying a license to a piece - of software. My quick checklist for applying a license includes: + description of the mechanics of applying a license to a + piece of software. My quick checklist for applying a license + includes: @@ -1946,18 +1960,19 @@ pages for more information and options. freeze in effect. + - - Forking + + Forks - Forks are like the most extreme version of a branch. A fork is - when a group of developers takes code from a free software - project and actually starts a brand new free software - project with it. The most famous example of a fork was between Emacs and - XEmacs. Both emacsen are based on an identical code-base - but for technical, political, and philosophical reasons, - development was split into two projects which now compete with - each other. + I wasn't sure about how I would deal with forking in this + document (or if I would deal with forking at all). A fork is when + a group of developers takes code from a free software project and + actually starts a brand new free software project with it. The + most famous example of a fork was between Emacs and XEmacs. Both + emacsen are based on an identical code-base but for technical, + political, and philosophical reasons, development was split into + two projects which now compete with each other. @@ -1977,7 +1992,6 @@ pages for more information and options. absolutely unresolvable, I recommend Fogel's book as a good place to start. - diff --git a/TODO b/TODO index 62fe510..4742e7b 100644 --- a/TODO +++ b/TODO @@ -6,22 +6,14 @@ person because it is usually used more subtly in other HOWTO's (Josh Crawford). + +DocBook Issues +========================= * Needs a ToC for navigation (Josh Crawford). * HTML (split) is weird. "in one place in Interacting w/ Developers, it refers to the previous section, Interacting w/ Developers" (Josh Crawford). -* "other random html bits: in "a good description of mechanics of - applying a license to a piece of software", "mechanica of applying a - license" would make better link text than "a good desctiption"... - your link to cathedral & bazaar would be better on the title than - the text "online"" (Josh Crawford). - -* The section on forking seems out of place. It might be something to - consider when startina project rather than grouping with branches - (which are purely organization and a very differe thing) (Josh - Crawford). - * Still lots of spelling funk. Mainly wrong words used places (eg thing instead of think) (Josh Crawford). -- 2.39.5