Merge branch 'native-layout-incubator'

[~andy/gtk] / gtk / gtkfilechooser.c

diff --git a/gtk/gtkfilechooser.c b/gtk/gtkfilechooser.c
index 85f972f064bd6d9bd4d70fe7680c6a9c2b63a75d..7341b6397413a7eec98596afc7ac33dce26ef1f7 100644 (file)
--- a/gtk/gtkfilechooser.c
+++ b/gtk/gtkfilechooser.c
@@ -323,7 +323,7 @@
  *     </variablelist>
  * <note>
  *    You can create your own bindings for the
- *    GtkFileChooserDefault::location-popup signal with custom
+ *    #GtkFileChooserDefault::location-popup signal with custom
  *    <parameter>path</parameter> strings, and have a crude form
  *    of easily-to-type bookmarks.  For example, say you access
  *    the path <filename>/home/username/misc</filename> very
@@ -504,7 +504,11 @@
  *         </listitem>
  *       </varlistentry>
  *       <varlistentry>
+<<<<<<< HEAD
  *         <term><parameter>bookmark_indes</parameter>&nbsp;:</term>
+=======
+ *         <term><parameter>bookmark_index</parameter>&nbsp;:</term>
+>>>>>>> native-layout-incubator
  *         <listitem>
  *           <simpara>
  *             index of the bookmark to switch to; the indices start at 0.