merge_doc_ref.patch
text/x-patch
Patch
Same data as JSON:
GET /api/v1/attachments/:id/patch
the parsed metadata as JSON — format, series position, per-file stats; never the diff bytes.
API reference →
Format: context
| File | + | − |
|---|---|---|
| doc/src/sgml/ref/allfiles.sgml | 1 | 0 |
| doc/src/sgml/reference.sgml | 1 | 0 |
| doc/src/sgml/ref/update.sgml | 3 | 0 |
Index: doc/src/sgml/reference.sgml
===================================================================
RCS file: /home/sriggs/pg/REPOSITORY/pgsql/doc/src/sgml/reference.sgml,v
retrieving revision 1.66
diff -c -r1.66 reference.sgml
*** doc/src/sgml/reference.sgml 27 Mar 2008 17:24:16 -0000 1.66
--- doc/src/sgml/reference.sgml 18 Apr 2008 17:50:31 -0000
***************
*** 135,140 ****
--- 135,141 ----
&listen;
&load;
&lock;
+ &merge;
&move;
¬ify;
&prepare;
Index: doc/src/sgml/ref/allfiles.sgml
===================================================================
RCS file: /home/sriggs/pg/REPOSITORY/pgsql/doc/src/sgml/ref/allfiles.sgml,v
retrieving revision 1.73
diff -c -r1.73 allfiles.sgml
*** doc/src/sgml/ref/allfiles.sgml 27 Mar 2008 17:24:16 -0000 1.73
--- doc/src/sgml/ref/allfiles.sgml 18 Apr 2008 11:10:16 -0000
***************
*** 107,112 ****
--- 107,113 ----
<!entity listen system "listen.sgml">
<!entity load system "load.sgml">
<!entity lock system "lock.sgml">
+ <!entity merge system "merge.sgml">
<!entity move system "move.sgml">
<!entity notify system "notify.sgml">
<!entity prepare system "prepare.sgml">
Index: doc/src/sgml/ref/update.sgml
===================================================================
RCS file: /home/sriggs/pg/REPOSITORY/pgsql/doc/src/sgml/ref/update.sgml,v
retrieving revision 1.46
diff -c -r1.46 update.sgml
*** doc/src/sgml/ref/update.sgml 15 Feb 2008 22:17:06 -0000 1.46
--- doc/src/sgml/ref/update.sgml 21 Apr 2008 19:01:36 -0000
***************
*** 322,327 ****
--- 322,330 ----
-- continue with other operations, and eventually
COMMIT;
</programlisting>
+
+ This operation can be executed in a single statement using
+ <xref linkend="sql-merge" endterm="sql-merge-title">.
</para>
<para>