|
From: <ian...@us...> - 2003-07-05 04:47:21
|
Update of /cvsroot/sqlobject/SOWeb/docs In directory sc8-pr-cvs1:/tmp/cvs-serv22908/docs Modified Files: SQLObject.html build default.css Log Message: got rid of header backlinks Index: SQLObject.html =================================================================== RCS file: /cvsroot/sqlobject/SOWeb/docs/SQLObject.html,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** SQLObject.html 5 Jul 2003 04:39:07 -0000 1.4 --- SQLObject.html 5 Jul 2003 04:47:02 -0000 1.5 *************** *** 74,78 **** </div> <div class="section" id="author-site-and-license"> ! <h1><a class="toc-backref" href="#id7" name="author-site-and-license">Author, Site, and License</a></h1> <p>SQLObject is by Ian Bicking (<a class="reference" href="mailto:ianb@colorstudy.com">ianb@colorstudy.com</a>). The website is <a class="reference" href="http://sqlobject.org">sqlobject.org</a>.</p> --- 74,78 ---- </div> <div class="section" id="author-site-and-license"> ! <h1><a name="author-site-and-license">Author, Site, and License</a></h1> <p>SQLObject is by Ian Bicking (<a class="reference" href="mailto:ianb@colorstudy.com">ianb@colorstudy.com</a>). The website is <a class="reference" href="http://sqlobject.org">sqlobject.org</a>.</p> *************** *** 85,89 **** </div> <div class="section" id="introduction"> ! <h1><a class="toc-backref" href="#id8" name="introduction">Introduction</a></h1> <p>SQLObject is an <em>object-relational mapper</em>. It allows you to translate RDBMS table rows into Python objects, and manipulate those --- 85,89 ---- </div> <div class="section" id="introduction"> ! <h1><a name="introduction">Introduction</a></h1> <p>SQLObject is an <em>object-relational mapper</em>. It allows you to translate RDBMS table rows into Python objects, and manipulate those *************** *** 99,103 **** </div> <div class="section" id="requirements"> ! <h1><a class="toc-backref" href="#id9" name="requirements">Requirements</a></h1> <p>Currently SQLObject supports MySQL, PostgreSQL (via <tt class="literal"><span class="pre">psycopg</span></tt>), SQLite, and a DBM-based store. The DBM backend is the youngest, --- 99,103 ---- </div> <div class="section" id="requirements"> ! <h1><a name="requirements">Requirements</a></h1> <p>Currently SQLObject supports MySQL, PostgreSQL (via <tt class="literal"><span class="pre">psycopg</span></tt>), SQLite, and a DBM-based store. The DBM backend is the youngest, *************** *** 107,111 **** </div> <div class="section" id="compared-to-other-database-wrappers"> ! <h1><a class="toc-backref" href="#id10" name="compared-to-other-database-wrappers">Compared To Other Database Wrappers</a></h1> <p>There are several object-relational mappers (ORM) for Python. I honestly can't comment deeply on the quality of those packages, but --- 107,111 ---- </div> <div class="section" id="compared-to-other-database-wrappers"> ! <h1><a name="compared-to-other-database-wrappers">Compared To Other Database Wrappers</a></h1> <p>There are several object-relational mappers (ORM) for Python. I honestly can't comment deeply on the quality of those packages, but *************** *** 153,157 **** </div> <div class="section" id="future"> ! <h1><a class="toc-backref" href="#id11" name="future">Future</a></h1> <p>Here are some things I plan:</p> <ul class="simple"> --- 153,157 ---- </div> <div class="section" id="future"> ! <h1><a name="future">Future</a></h1> <p>Here are some things I plan:</p> <ul class="simple"> *************** *** 173,180 **** </div> <div class="section" id="using-sqlobject-an-introduction"> ! <h1><a class="toc-backref" href="#id12" name="using-sqlobject-an-introduction">Using SQLObject: An Introduction</a></h1> <p>Let's start off quickly...</p> <div class="section" id="declaring-the-class"> ! <h2><a class="toc-backref" href="#id13" name="declaring-the-class">Declaring the Class</a></h2> <p>To begin with, let's make a database connection. Choose from one of <cite>MySQLConnection</cite>, <cite>PostgresConnection</cite>, <cite>SQLiteConnection</cite>, and --- 173,180 ---- </div> <div class="section" id="using-sqlobject-an-introduction"> ! <h1><a name="using-sqlobject-an-introduction">Using SQLObject: An Introduction</a></h1> <p>Let's start off quickly...</p> <div class="section" id="declaring-the-class"> ! <h2><a name="declaring-the-class">Declaring the Class</a></h2> <p>To begin with, let's make a database connection. Choose from one of <cite>MySQLConnection</cite>, <cite>PostgresConnection</cite>, <cite>SQLiteConnection</cite>, and *************** *** 240,244 **** </div> <div class="section" id="using-the-class"> ! <h2><a class="toc-backref" href="#id14" name="using-the-class">Using the Class</a></h2> <p>Now that you have a class, how will you use it? We'll be considering the class defined above.</p> --- 240,244 ---- </div> <div class="section" id="using-the-class"> ! <h2><a name="using-the-class">Using the Class</a></h2> <p>Now that you have a class, how will you use it? We'll be considering the class defined above.</p> *************** *** 332,336 **** </div> <div class="section" id="one-to-many-relationships"> ! <h2><a class="toc-backref" href="#id15" name="one-to-many-relationships">One-to-Many Relationships</a></h2> <p>Well, a real address book should have people, but also addresses. These examples are in <tt class="literal"><span class="pre">personaddress.py</span></tt></p> --- 332,336 ---- </div> <div class="section" id="one-to-many-relationships"> ! <h2><a name="one-to-many-relationships">One-to-Many Relationships</a></h2> <p>Well, a real address book should have people, but also addresses. These examples are in <tt class="literal"><span class="pre">personaddress.py</span></tt></p> *************** *** 376,380 **** </div> <div class="section" id="many-to-many-relationships"> ! <h2><a class="toc-backref" href="#id16" name="many-to-many-relationships">Many-to-Many Relationships</a></h2> <p>For this example we will have user and role objects. The two have a many-to-many relationship, which is represented with the --- 376,380 ---- </div> <div class="section" id="many-to-many-relationships"> ! <h2><a name="many-to-many-relationships">Many-to-Many Relationships</a></h2> <p>For this example we will have user and role objects. The two have a many-to-many relationship, which is represented with the *************** *** 443,447 **** </div> <div class="section" id="selecting-multiple-objects"> ! <h2><a class="toc-backref" href="#id17" name="selecting-multiple-objects">Selecting Multiple Objects</a></h2> <p>While the full power of all the kinds of joins you can do with a database are not revealed in SQLObject, a simple <tt class="literal"><span class="pre">SELECT</span></tt> is --- 443,447 ---- </div> <div class="section" id="selecting-multiple-objects"> ! <h2><a name="selecting-multiple-objects">Selecting Multiple Objects</a></h2> <p>While the full power of all the kinds of joins you can do with a database are not revealed in SQLObject, a simple <tt class="literal"><span class="pre">SELECT</span></tt> is *************** *** 509,513 **** </div> <div class="section" id="customizing-the-objects"> ! <h2><a class="toc-backref" href="#id18" name="customizing-the-objects">Customizing the Objects</a></h2> <p>While we haven't done so in the examples, you can include your own methods in the class definition. Writing you own methods should be --- 509,513 ---- </div> <div class="section" id="customizing-the-objects"> ! <h2><a name="customizing-the-objects">Customizing the Objects</a></h2> <p>While we haven't done so in the examples, you can include your own methods in the class definition. Writing you own methods should be *************** *** 515,519 **** some other details to be aware of.</p> <div class="section" id="initializing-the-objects"> ! <h3><a class="toc-backref" href="#id19" name="initializing-the-objects">Initializing the Objects</a></h3> <p>With new-style classes, <cite>__init__</cite> is called everytime the class is called. That means it's called when an object is just fetched from --- 515,519 ---- some other details to be aware of.</p> <div class="section" id="initializing-the-objects"> ! <h3><a name="initializing-the-objects">Initializing the Objects</a></h3> <p>With new-style classes, <cite>__init__</cite> is called everytime the class is called. That means it's called when an object is just fetched from *************** *** 523,527 **** </div> <div class="section" id="adding-magic-attributes-properties"> ! <h3><a class="toc-backref" href="#id20" name="adding-magic-attributes-properties">Adding Magic Attributes (properties)</a></h3> <p>You can use all the normal techniques for defining this new-style class, including <cite>classmethod</cite>, <cite>staticmethod</cite>, and <cite>property</cite>, but --- 523,527 ---- </div> <div class="section" id="adding-magic-attributes-properties"> ! <h3><a name="adding-magic-attributes-properties">Adding Magic Attributes (properties)</a></h3> <p>You can use all the normal techniques for defining this new-style class, including <cite>classmethod</cite>, <cite>staticmethod</cite>, and <cite>property</cite>, but *************** *** 571,575 **** </div> <div class="section" id="overriding-column-attributes"> ! <h3><a class="toc-backref" href="#id21" name="overriding-column-attributes">Overriding Column Attributes</a></h3> <p>It's a little more complicated if you want to override the behavior of an database column attribute. For instance, imagine there's special --- 571,575 ---- </div> <div class="section" id="overriding-column-attributes"> ! <h3><a name="overriding-column-attributes">Overriding Column Attributes</a></h3> <p>It's a little more complicated if you want to override the behavior of an database column attribute. For instance, imagine there's special *************** *** 630,639 **** </div> <div class="section" id="reference"> ! <h1><a class="toc-backref" href="#id22" name="reference">Reference</a></h1> <p>The instructions above should tell you enough to get you started, and be useful for many situations. Now we'll show how to specify the class more completely.</p> <div class="section" id="col-class-specifying-columns"> ! <h2><a class="toc-backref" href="#id23" name="col-class-specifying-columns">Col Class: Specifying Columns</a></h2> <p>The list of columns is a list of <cite>Col</cite> objects. These objects don't have functionality in themselves, but give you a way to specify the --- 630,639 ---- </div> <div class="section" id="reference"> ! <h1><a name="reference">Reference</a></h1> <p>The instructions above should tell you enough to get you started, and be useful for many situations. Now we'll show how to specify the class more completely.</p> <div class="section" id="col-class-specifying-columns"> ! <h2><a name="col-class-specifying-columns">Col Class: Specifying Columns</a></h2> <p>The list of columns is a list of <cite>Col</cite> objects. These objects don't have functionality in themselves, but give you a way to specify the *************** *** 675,679 **** </dl> <div class="section" id="subclasses-of-col"> ! <h3><a class="toc-backref" href="#id24" name="subclasses-of-col">Subclasses of Col</a></h3> <p>The <cite>ForeignKey</cite> class should be used instead of <cite>Col</cite> when the column is a reference to another table/class. It is generally used like --- 675,679 ---- </dl> <div class="section" id="subclasses-of-col"> ! <h3><a name="subclasses-of-col">Subclasses of Col</a></h3> <p>The <cite>ForeignKey</cite> class should be used instead of <cite>Col</cite> when the column is a reference to another table/class. It is generally used like *************** *** 722,726 **** </div> <div class="section" id="sqlobject-class-specifying-your-class"> ! <h2><a class="toc-backref" href="#id25" name="sqlobject-class-specifying-your-class">SQLObject Class: Specifying Your Class</a></h2> <p>In addition to the columns, there are a number of other special attributes you can set in your class.</p> --- 722,726 ---- </div> <div class="section" id="sqlobject-class-specifying-your-class"> ! <h2><a name="sqlobject-class-specifying-your-class">SQLObject Class: Specifying Your Class</a></h2> <p>In addition to the columns, there are a number of other special attributes you can set in your class.</p> *************** *** 758,767 **** </div> <div class="section" id="relationships-between-classes-tables"> ! <h2><a class="toc-backref" href="#id26" name="relationships-between-classes-tables">Relationships Between Classes/Tables</a></h2> <p>You can use the <cite>ForeignKey</cite> to handle foreign references in a table, but for back references and many-to-many relationships you'll use joins.</p> <div class="section" id="multiplejoin-one-to-many"> ! <h3><a class="toc-backref" href="#id27" name="multiplejoin-one-to-many">MultipleJoin: One-to-Many</a></h3> <p>See <a class="reference" href="#one-to-many-relationships">One-to-Many Relationships</a> for an example of one-to-many relationships.</p> --- 758,767 ---- </div> <div class="section" id="relationships-between-classes-tables"> ! <h2><a name="relationships-between-classes-tables">Relationships Between Classes/Tables</a></h2> <p>You can use the <cite>ForeignKey</cite> to handle foreign references in a table, but for back references and many-to-many relationships you'll use joins.</p> <div class="section" id="multiplejoin-one-to-many"> ! <h3><a name="multiplejoin-one-to-many">MultipleJoin: One-to-Many</a></h3> <p>See <a class="reference" href="#one-to-many-relationships">One-to-Many Relationships</a> for an example of one-to-many relationships.</p> *************** *** 784,788 **** </div> <div class="section" id="relatedjoin-many-to-many"> ! <h3><a class="toc-backref" href="#id28" name="relatedjoin-many-to-many">RelatedJoin: Many-to-Many</a></h3> <p>See <a class="reference" href="#many-to-many-relationships">Many-to-Many Relationships</a> for examples of using many-to-many joins.</p> <p><cite>RelatedJoin</cite> has all the keyword arguments of <a class="reference" href="#multiple-join-keywords">MultipleJoin</a>, plus:</p> --- 784,788 ---- </div> <div class="section" id="relatedjoin-many-to-many"> ! <h3><a name="relatedjoin-many-to-many">RelatedJoin: Many-to-Many</a></h3> <p>See <a class="reference" href="#many-to-many-relationships">Many-to-Many Relationships</a> for examples of using many-to-many joins.</p> <p><cite>RelatedJoin</cite> has all the keyword arguments of <a class="reference" href="#multiple-join-keywords">MultipleJoin</a>, plus:</p> *************** *** 829,833 **** </div> <div class="section" id="transactions"> ! <h2><a class="toc-backref" href="#id29" name="transactions">Transactions</a></h2> <p>Transaction support in SQLObject is left to the database. Transactions can be used like:</p> --- 829,833 ---- </div> <div class="section" id="transactions"> ! <h2><a name="transactions">Transactions</a></h2> <p>Transaction support in SQLObject is left to the database. Transactions can be used like:</p> *************** *** 853,857 **** </div> <div class="section" id="automatic-schema-generation"> ! <h2><a class="toc-backref" href="#id30" name="automatic-schema-generation">Automatic Schema Generation</a></h2> <p>All the connections support creating and droping tables based on the class definition. First you have to prepare your class definition, --- 853,857 ---- </div> <div class="section" id="automatic-schema-generation"> ! <h2><a name="automatic-schema-generation">Automatic Schema Generation</a></h2> <p>All the connections support creating and droping tables based on the class definition. First you have to prepare your class definition, *************** *** 859,863 **** <a class="reference" href="#dbmconnection">DBMConnection</a> do not require or use type information).</p> <div class="section" id="columns-types"> ! <h3><a class="toc-backref" href="#id31" name="columns-types">Columns Types</a></h3> <p>A column type is indicated by using a subclass of <cite>Col</cite>:</p> <dl> --- 859,863 ---- <a class="reference" href="#dbmconnection">DBMConnection</a> do not require or use type information).</p> <div class="section" id="columns-types"> ! <h3><a name="columns-types">Columns Types</a></h3> <p>A column type is indicated by using a subclass of <cite>Col</cite>:</p> <dl> *************** *** 893,897 **** </div> <div class="section" id="creating-and-dropping-tables"> ! <h3><a class="toc-backref" href="#id32" name="creating-and-dropping-tables">Creating and Dropping Tables</a></h3> <p>To create a table call <cite>createTable</cite>. It takes two arguments:</p> <dl> --- 893,897 ---- </div> <div class="section" id="creating-and-dropping-tables"> ! <h3><a name="creating-and-dropping-tables">Creating and Dropping Tables</a></h3> <p>To create a table call <cite>createTable</cite>. It takes two arguments:</p> <dl> *************** *** 910,919 **** </div> <div class="section" id="dynamic-classes"> ! <h1><a class="toc-backref" href="#id33" name="dynamic-classes">Dynamic Classes</a></h1> <p>SQLObject classes can be manipulated dynamically. This leaves open the possibility of constructing SQLObject classes from an XML file, from database introspection, or from a graphical interface.</p> <div class="section" id="automatic-class-generation"> ! <h2><a class="toc-backref" href="#id34" name="automatic-class-generation">Automatic Class Generation</a></h2> <p>SQLObject can read the table description from the database, and fill in the class columns (as would normally be described in the <cite>_columns</cite> --- 910,919 ---- </div> <div class="section" id="dynamic-classes"> ! <h1><a name="dynamic-classes">Dynamic Classes</a></h1> <p>SQLObject classes can be manipulated dynamically. This leaves open the possibility of constructing SQLObject classes from an XML file, from database introspection, or from a graphical interface.</p> <div class="section" id="automatic-class-generation"> ! <h2><a name="automatic-class-generation">Automatic Class Generation</a></h2> <p>SQLObject can read the table description from the database, and fill in the class columns (as would normally be described in the <cite>_columns</cite> *************** *** 929,933 **** </div> <div class="section" id="runtime-column-changes"> ! <h2><a class="toc-backref" href="#id35" name="runtime-column-changes">Runtime Column Changes</a></h2> <p><em>SQLite does not support this feature</em></p> <p>You can add and remove columns to your class at runtime. Such changes --- 929,933 ---- </div> <div class="section" id="runtime-column-changes"> ! <h2><a name="runtime-column-changes">Runtime Column Changes</a></h2> <p><em>SQLite does not support this feature</em></p> <p>You can add and remove columns to your class at runtime. Such changes *************** *** 949,958 **** </div> <div class="section" id="legacy-database-schemas"> ! <h1><a class="toc-backref" href="#id36" name="legacy-database-schemas">Legacy Database Schemas</a></h1> <p>Often you will have a database that already exists, and does not use the naming conventions that SQLObject expects, or does not use any naming convention at all.</p> <div class="section" id="sqlobject-requirements"> ! <h2><a class="toc-backref" href="#id37" name="sqlobject-requirements">SQLObject requirements</a></h2> <p>While SQLObject tries not to make too many requirements on your schema, some assumptions are made. Some of these may be relaxed in --- 949,958 ---- </div> <div class="section" id="legacy-database-schemas"> ! <h1><a name="legacy-database-schemas">Legacy Database Schemas</a></h1> <p>Often you will have a database that already exists, and does not use the naming conventions that SQLObject expects, or does not use any naming convention at all.</p> <div class="section" id="sqlobject-requirements"> ! <h2><a name="sqlobject-requirements">SQLObject requirements</a></h2> <p>While SQLObject tries not to make too many requirements on your schema, some assumptions are made. Some of these may be relaxed in *************** *** 979,983 **** </div> <div class="section" id="changing-the-naming-style"> ! <h2><a class="toc-backref" href="#id38" name="changing-the-naming-style">Changing the Naming Style</a></h2> <p>By default names in SQLObject are expected to be mixed case in Python (like <tt class="literal"><span class="pre">mixedCase</span></tt>), and underscore-separated in SQL (like --- 979,983 ---- </div> <div class="section" id="changing-the-naming-style"> ! <h2><a name="changing-the-naming-style">Changing the Naming Style</a></h2> <p>By default names in SQLObject are expected to be mixed case in Python (like <tt class="literal"><span class="pre">mixedCase</span></tt>), and underscore-separated in SQL (like *************** *** 1015,1019 **** </div> <div class="section" id="irregular-naming"> ! <h2><a class="toc-backref" href="#id39" name="irregular-naming">Irregular Naming</a></h2> <p>While naming conventions are nice, they are not always present. You can control most of the names that SQLObject uses, independent of the --- 1015,1019 ---- </div> <div class="section" id="irregular-naming"> ! <h2><a name="irregular-naming">Irregular Naming</a></h2> <p>While naming conventions are nice, they are not always present. You can control most of the names that SQLObject uses, independent of the *************** *** 1034,1038 **** </div> <div class="section" id="dbconnection-database-connections"> ! <h1><a class="toc-backref" href="#id40" name="dbconnection-database-connections">DBConnection: Database Connections</a></h1> <p>The <cite>DBConnection</cite> module currently has four external classes, <cite>MySQLConnection</cite>, <cite>PostgresConnection</cite>, <cite>SQLiteConnection</cite>, --- 1034,1038 ---- </div> <div class="section" id="dbconnection-database-connections"> ! <h1><a name="dbconnection-database-connections">DBConnection: Database Connections</a></h1> <p>The <cite>DBConnection</cite> module currently has four external classes, <cite>MySQLConnection</cite>, <cite>PostgresConnection</cite>, <cite>SQLiteConnection</cite>, *************** *** 1042,1046 **** console.</p> <div class="section" id="mysql"> ! <h2><a class="toc-backref" href="#id41" name="mysql">MySQL</a></h2> <p><cite>MySQLConnection</cite> takes the keyword arguments <cite>host</cite>, <cite>db</cite>, <cite>user</cite>, and <cite>passwd</cite>, just like <cite>MySQLdb.connect</cite> does.</p> --- 1042,1046 ---- console.</p> <div class="section" id="mysql"> ! <h2><a name="mysql">MySQL</a></h2> <p><cite>MySQLConnection</cite> takes the keyword arguments <cite>host</cite>, <cite>db</cite>, <cite>user</cite>, and <cite>passwd</cite>, just like <cite>MySQLdb.connect</cite> does.</p> *************** *** 1050,1054 **** </div> <div class="section" id="postgres"> ! <h2><a class="toc-backref" href="#id42" name="postgres">Postgres</a></h2> <p><cite>PostgresConnection</cite> takes a single connection string, like <tt class="literal"><span class="pre">"dbname=something</span> <span class="pre">user=some_user"</span></tt>, just like <cite>psycopg.connect</cite>. --- 1050,1054 ---- </div> <div class="section" id="postgres"> ! <h2><a name="postgres">Postgres</a></h2> <p><cite>PostgresConnection</cite> takes a single connection string, like <tt class="literal"><span class="pre">"dbname=something</span> <span class="pre">user=some_user"</span></tt>, just like <cite>psycopg.connect</cite>. *************** *** 1058,1062 **** </div> <div class="section" id="sqlite"> ! <h2><a class="toc-backref" href="#id43" name="sqlite">SQLite</a></h2> <p><cite>SQLiteConnection</cite> takes the a single string, which is the path to the database file.</p> --- 1058,1062 ---- </div> <div class="section" id="sqlite"> ! <h2><a name="sqlite">SQLite</a></h2> <p><cite>SQLiteConnection</cite> takes the a single string, which is the path to the database file.</p> *************** *** 1071,1075 **** </div> <div class="section" id="dbmconnection"> ! <h2><a class="toc-backref" href="#id44" name="dbmconnection">DBMConnection</a></h2> <p><cite>DBMConnection</cite> takes a single string, which is the path to a directory in which to store the database.</p> --- 1071,1075 ---- </div> <div class="section" id="dbmconnection"> ! <h2><a name="dbmconnection">DBMConnection</a></h2> <p><cite>DBMConnection</cite> takes a single string, which is the path to a directory in which to store the database.</p> *************** *** 1087,1091 **** </div> <div class="section" id="exported-symbols"> ! <h1><a class="toc-backref" href="#id45" name="exported-symbols">Exported Symbols</a></h1> <p>You can use <tt class="literal"><span class="pre">from</span> <span class="pre">SQLObject</span> <span class="pre">import</span> <span class="pre">*</span></tt>, though you don't have to. It exports a minimal number of symbols. The symbols exported:</p> --- 1087,1091 ---- </div> <div class="section" id="exported-symbols"> ! <h1><a name="exported-symbols">Exported Symbols</a></h1> <p>You can use <tt class="literal"><span class="pre">from</span> <span class="pre">SQLObject</span> <span class="pre">import</span> <span class="pre">*</span></tt>, though you don't have to. It exports a minimal number of symbols. The symbols exported:</p> Index: build =================================================================== RCS file: /cvsroot/sqlobject/SOWeb/docs/build,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** build 5 Jul 2003 04:39:07 -0000 1.4 --- build 5 Jul 2003 04:47:02 -0000 1.5 *************** *** 6,8 **** cp $SOURCEDIR/../examples/snippets/*.html ../examples/snippets/ cd .. ! buildhtml.py --- 6,8 ---- cp $SOURCEDIR/../examples/snippets/*.html ../examples/snippets/ cd .. ! buildhtml.py --no-toc-backlinks Index: default.css =================================================================== RCS file: /cvsroot/sqlobject/SOWeb/docs/default.css,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 |
