Merge pull request ocaml#1092 from AltGr/prepare-1.1.1

CHANGES, copyright year and generated files updates

CHANGES

@@ -21,6 +21,9 @@
 * More accurate warnings for unknown package dependencies (#1079)
 * Added `opam config report` to help with bug reports (#1034)
 * Do not reinstall dev packages with `opam upgrade <pkg>` (#1001)
+* Be more careful with `opam init` to a non-empty root directory (#974)
+* Cleanup build-dir after successful compiler installation to save on space (#1006)
+* Enable packagers to specify mirrors in url files (#807)
 
 1.1.0 [Oct 2013]
 * Fix update of dev packages (#962)

configure

@@ -9,7 +9,7 @@
 # This configure script is free software; the Free Software Foundation
 # gives unlimited permission to copy, distribute and modify it.
 #
-# Copyright 2012-2013 OcamlPro SAS
+# Copyright 2012-2014 OcamlPro SAS
 ## -------------------- ##
 ## M4sh Initialization. ##
 ## -------------------- ##
@@ -1366,7 +1366,7 @@ Copyright (C) 2012 Free Software Foundation, Inc.
 This configure script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it.
 
-Copyright 2012-2013 OcamlPro SAS
+Copyright 2012-2014 OcamlPro SAS
 _ACEOF
   exit
 fi

configure.ac

@@ -1,5 +1,5 @@
 AC_INIT(opam,1.1.1)
-AC_COPYRIGHT(Copyright 2012-2013 OcamlPro SAS)
+AC_COPYRIGHT(Copyright 2012-2014 OcamlPro SAS)
 
 AC_CONFIG_MACRO_DIR([m4])
 AC_PROG_CC

doc/man/opam-config.1

@@ -102,6 +102,9 @@ returns bytecode linking options.
 .TP 4
 \fBasmlink\fR
 returns assembly compile options.
+.TP 4
+\fBreport\fR
+Prints a summary of your setup, useful for bug\-reports.
 .SH COMMON OPTIONS
 .P
 These options are common to all commands.

doc/man/opam-switch.1

@@ -92,7 +92,7 @@ Install the packages from a file.
 Reinstall the given compiler switch. This will also try reinstall the installed packages.
 .TP 4
 \fBlist\fR
-List the available compilers. The first column displays the switch name (if any), the second one the switch state (C = current, I = installed, \-\- = not installed), the third one the compiler name and the last one the compiler description. To switch to an already installed compiler alias (with state = I), use \fBopam switch <name>\fR. If you want to use a new compiler <comp>, use \fBopam switch <comp>\fR: this will download, compile and create a fresh and independent environment where new packages can be installed. If you want to create a new compiler alias (for instance because you already have this compiler version installed), use \fBopam switch <name> \-\-alias\-of <comp>\fR. In case <name> and <comp> are the same, this is equivalent to \fBopam switch <comp>\fR.
+List compilers. By default, lists installed and `standard' compilers. Use `\-\-all' to get the list of all installable compilers. The first column displays the switch name (if any), the second one the switch state (C = current, I = installed, \-\- = not installed), the third one the compiler name and the last one the compiler description. To switch to an already installed compiler alias (with state = I), use \fBopam switch <name>\fR. If you want to use a new compiler <comp>, use \fBopam switch <comp>\fR: this will download, compile and create a fresh and independent environment where new packages can be installed. If you want to create a new compiler alias (for instance because you already have this compiler version installed), use \fBopam switch <name> \-\-alias\-of <comp>\fR. In case <name> and <comp> are the same, this is equivalent to \fBopam switch <comp>\fR.
 .TP 4
 \fBshow\fR
 Show the current compiler.