Merge tag 'snapshot-start' into stable

[gnulib.git] / doc / standards.texi

diff --git a/doc/standards.texi b/doc/standards.texi
index fc0761f..2b2eed6 100644 (file)
--- a/doc/standards.texi
+++ b/doc/standards.texi
@@ -3,7 +3,11 @@
 @setfilename standards.info
 @settitle GNU Coding Standards
 @c This date is automagically updated when you save this file:
+<<<<<<< HEAD
+@set lastupdate December 10, 2011
+=======
 @set lastupdate March 8, 2012
+>>>>>>> snapshot-start
 @c %**end of header
 
 @dircategory GNU organization
@@ -3221,11 +3225,16 @@ closing quote, and a program can use these translations.  Generally,
 though, it is better to translate quote characters in the context of
 longer strings.
 
+<<<<<<< HEAD
+Unicode contains the unambiguous quote characters required.  However,
+Unicode and UTF-8 are not universally well-supported, either.
+=======
 If the output of your program is ever likely to be parsed by another
 program, it is good to provide an option that makes this parsing
 reliable.  For example, you could escape special characters using
 conventions from the C language or the Bourne shell.  See for example
 the option @option{--quoting-style} of GNU @code{ls}.
+>>>>>>> snapshot-start
 
 @clear txicodequoteundirected
 @clear txicodequotebacktick