Imported Upstream version 2.31.91upstream/2.31.91

4 files changed, 20 insertions, 29 deletions

diff --git a/help/C/edit.page b/help/C/edit.page
deleted file mode 100644
index 32d501d..0000000
--- a/help/C/edit.page
+++ /dev/null
@@ -1,15 +0,0 @@
-<page xmlns="http://projectmallard.org/1.0/"
-      type="guide"
-      id="edit">
-
-    <info>
-        <link type="guide" xref="index#modify"/>
-    </info>
-  
-	<title>Editing a Document</title>
-
-    <p>
-    <app>Simple Scan</app> does not provide any editing functions.
-    To edit a document <link xref="save">save the document</link> and open it in your favourite editing application.
-    </p>
-</page>
diff --git a/help/C/reorder.page b/help/C/reorder.page
new file mode 100644
index 0000000..0892e4c
--- /dev/null
+++ b/help/C/reorder.page
@@ -0,0 +1,17 @@
+<page xmlns="http://projectmallard.org/1.0/"
+      type="guide"
+      id="reorder">
+
+    <info>
+        <link type="guide" xref="index#modify"/>
+    </info>
+  
+	<title>Reordering Pages</title>
+
+    <p>
+    To move a page, select it and move the page left or right using the <key>&lt;</key> and <key>&gt;</key> keys.
+    </p>
+    <p>
+    To remove the selected page use the <key>Delete</key> key.
+    </p>
+</page>
diff --git a/help/Makefile.am b/help/Makefile.am
index d12f00d..a901f88 100644
--- a/help/Makefile.am
+++ b/help/Makefile.am
@@ -9,9 +9,9 @@ DOC_PAGES = index.page \
             adf.page \
             crop.page \
             dpi.page \
-            edit.page \
             email.page \
             print.page \
+            reorder.page \
             rotate.page \
             save.page \
             scanner.page \
diff --git a/help/Makefile.in b/help/Makefile.in
index d1ce867..6920b3c 100644
--- a/help/Makefile.in
+++ b/help/Makefile.in
@@ -62,7 +62,7 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+mkinstalldirs = $(install_sh) -d
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
 AM_V_GEN = $(am__v_GEN_$(V))
@@ -82,8 +82,6 @@ AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
-CATALOGS = @CATALOGS@
-CATOBJEXT = @CATOBJEXT@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
@@ -104,7 +102,6 @@ EXEEXT = @EXEEXT@
 GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
 GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
-GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
 GREP = @GREP@
 HELP_DIR = @HELP_DIR@
@@ -113,8 +110,6 @@ INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INSTOBJEXT = @INSTOBJEXT@
-INTLLIBS = @INTLLIBS@
 INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
 INTLTOOL_MERGE = @INTLTOOL_MERGE@
 INTLTOOL_PERL = @INTLTOOL_PERL@
@@ -127,9 +122,7 @@ LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
-MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
-MSGFMT_OPTS = @MSGFMT_OPTS@
 MSGMERGE = @MSGMERGE@
 OBJEXT = @OBJEXT@
 OMF_DIR = @OMF_DIR@
@@ -144,10 +137,6 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-POFILES = @POFILES@
-POSUB = @POSUB@
-PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
-PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SIMPLE_SCAN_CFLAGS = @SIMPLE_SCAN_CFLAGS@
@@ -316,9 +305,9 @@ DOC_PAGES = index.page \
             adf.page \
             crop.page \
             dpi.page \
-            edit.page \
             email.page \
             print.page \
+            reorder.page \
             rotate.page \
             save.page \
             scanner.page \