From 818c9e7edfce339eff7cb357f2ec29a72afd1977 Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Sat, 19 Mar 2016 16:09:42 +0100 Subject: patch 7.4.1601 Problem: README files take a lot of space in the top directory. Solution: Move most of them to "READMEdir". --- READMEdir/README.txt.info | Bin 0 -> 582 bytes READMEdir/README_ami.txt | 32 ++++++++ READMEdir/README_ami.txt.info | Bin 0 -> 582 bytes READMEdir/README_amibin.txt | 12 +++ READMEdir/README_amibin.txt.info | Bin 0 -> 582 bytes READMEdir/README_amisrc.txt | 11 +++ READMEdir/README_amisrc.txt.info | Bin 0 -> 582 bytes READMEdir/README_bindos.txt | 16 ++++ READMEdir/README_dos.txt | 154 +++++++++++++++++++++++++++++++++++++++ READMEdir/README_extra.txt | 51 +++++++++++++ READMEdir/README_mac.txt | 8 ++ READMEdir/README_ole.txt | 20 +++++ READMEdir/README_os2.txt | 5 ++ READMEdir/README_os390.txt | 117 +++++++++++++++++++++++++++++ READMEdir/README_src.txt | 8 ++ READMEdir/README_srcdos.txt | 12 +++ READMEdir/README_unix.txt | 10 +++ READMEdir/README_vms.txt | 48 ++++++++++++ READMEdir/README_w32s.txt | 15 ++++ 19 files changed, 519 insertions(+) create mode 100644 READMEdir/README.txt.info create mode 100644 READMEdir/README_ami.txt create mode 100644 READMEdir/README_ami.txt.info create mode 100644 READMEdir/README_amibin.txt create mode 100644 READMEdir/README_amibin.txt.info create mode 100644 READMEdir/README_amisrc.txt create mode 100644 READMEdir/README_amisrc.txt.info create mode 100644 READMEdir/README_bindos.txt create mode 100644 READMEdir/README_dos.txt create mode 100644 READMEdir/README_extra.txt create mode 100644 READMEdir/README_mac.txt create mode 100644 READMEdir/README_ole.txt create mode 100644 READMEdir/README_os2.txt create mode 100644 READMEdir/README_os390.txt create mode 100644 READMEdir/README_src.txt create mode 100644 READMEdir/README_srcdos.txt create mode 100644 READMEdir/README_unix.txt create mode 100644 READMEdir/README_vms.txt create mode 100644 READMEdir/README_w32s.txt (limited to 'READMEdir') diff --git a/READMEdir/README.txt.info b/READMEdir/README.txt.info new file mode 100644 index 000000000..e7fa11494 Binary files /dev/null and b/READMEdir/README.txt.info differ diff --git a/READMEdir/README_ami.txt b/READMEdir/README_ami.txt new file mode 100644 index 000000000..03cb6e24a --- /dev/null +++ b/READMEdir/README_ami.txt @@ -0,0 +1,32 @@ +README_ami.txt for version 7.4 of Vim: Vi IMproved. + +This file explains the installation of Vim on Amiga systems. +See README.txt for general information about Vim. + + +Unpack the distributed files in the place where you want to keep them. It is +wise to have a "vim" directory to keep your vimrc file and any other files you +change. The distributed files go into a subdirectory. This way you can +easily upgrade to a new version. For example: + + dh0:editors/vim contains your vimrc and modified files + dh0:editors/vim/vim54 contains the Vim version 5.4 distributed files + dh0:editors/vim/vim55 contains the Vim version 5.5 distributed files + +You would then unpack the archives like this: + + cd dh0:editors + tar xf t:vim60bin.tar + tar xf t:vim60rt.tar + +Set the $VIM environment variable to point to the top directory of your Vim +files. For the above example: + + set VIM=dh0:editors/vim + +Vim version 5.4 will look for your vimrc file in $VIM, and for the runtime +files in $VIM/vim54. See ":help $VIM" for more information. + +Make sure the Vim executable is in your search path. Either copy the Vim +executable to a directory that is in your search path, or (preferred) modify +the search path to include the directory where the Vim executable is. diff --git a/READMEdir/README_ami.txt.info b/READMEdir/README_ami.txt.info new file mode 100644 index 000000000..912436d6a Binary files /dev/null and b/READMEdir/README_ami.txt.info differ diff --git a/READMEdir/README_amibin.txt b/READMEdir/README_amibin.txt new file mode 100644 index 000000000..fbf5ba4c4 --- /dev/null +++ b/READMEdir/README_amibin.txt @@ -0,0 +1,12 @@ +README_amibin.txt for version 7.4 of Vim: Vi IMproved. + +See "README.txt" for general information about Vim. +See "README_ami.txt" for installation instructions for the Amiga. +These files are in the runtime archive (vim60rt.tgz). + + +The Amiga "bin" archive contains the Vim executable for the Amiga. It was +compiled with "big" features. + +Postscript printing is not included to avoid requiring floating point +computations. diff --git a/READMEdir/README_amibin.txt.info b/READMEdir/README_amibin.txt.info new file mode 100644 index 000000000..bdc3f028e Binary files /dev/null and b/READMEdir/README_amibin.txt.info differ diff --git a/READMEdir/README_amisrc.txt b/READMEdir/README_amisrc.txt new file mode 100644 index 000000000..ddc58be95 --- /dev/null +++ b/READMEdir/README_amisrc.txt @@ -0,0 +1,11 @@ +README_amisrc.txt for version 7.4 of Vim: Vi IMproved. + +See "README.txt" for general information about Vim. +See "README_ami.txt" for installation instructions for the Amiga. +These files are in the runtime archive (vim60rt.tgz). + + +The Amiga source archive contains the files needed to compile Vim on the +Amiga. + +See "src/INSTALLami.txt" for instructions on how to compile Vim on the Amiga. diff --git a/READMEdir/README_amisrc.txt.info b/READMEdir/README_amisrc.txt.info new file mode 100644 index 000000000..476af9ac0 Binary files /dev/null and b/READMEdir/README_amisrc.txt.info differ diff --git a/READMEdir/README_bindos.txt b/READMEdir/README_bindos.txt new file mode 100644 index 000000000..03c7c19ec --- /dev/null +++ b/READMEdir/README_bindos.txt @@ -0,0 +1,16 @@ +README_bindos.txt for version 7.4 of Vim: Vi IMproved. + +See "README.txt" for general information about Vim. +See "README_dos.txt" for installation instructions for MS-DOS and MS-Windows. +These files are in the runtime archive (vim74rt.zip). + + +There are several binary distributions of Vim for the PC. You would normally +pick only one of them, but it's also possible to install several. +These ones are available (the version number may differ): + vim74w32.zip Windows 95/98/NT/etc. console version + gvim74.zip Windows 95/98/NT/etc. GUI version + gvim74ole.zip Windows 95/98/NT/etc. GUI version with OLE + +You MUST also get the runtime archive (vim74rt.zip). +The sources are also available (vim74src.zip). diff --git a/READMEdir/README_dos.txt b/READMEdir/README_dos.txt new file mode 100644 index 000000000..662a7e785 --- /dev/null +++ b/READMEdir/README_dos.txt @@ -0,0 +1,154 @@ +README_dos.txt for version 7.4 of Vim: Vi IMproved. + +This file explains the installation of Vim on MS-DOS and MS-Windows systems. +See "README.txt" for general information about Vim. + +There are two ways to install Vim: +A. Use the self-installing .exe file. +B. Unpack .zip files and run the install.exe program. + + +A. Using the self-installing .exe +--------------------------------- + +This is mostly self-explaining. Just follow the prompts and make the +selections. A few things to watch out for: + +- When an existing installation is detected, you are offered to first remove + this. The uninstall program is then started while the install program waits + for it to complete. Sometimes the windows overlap each other, which can be + confusing. Be sure the complete the uninstalling before continuing the + installation. Watch the taskbar for uninstall windows. + +- When selecting a directory to install Vim, use the same place where other + versions are located. This makes it easier to find your _vimrc file. For + example "C:\Program Files\vim" or "D:\vim". A name ending in "vim" is + preferred. + +- After selecting the directory where to install Vim, clicking on "Next" will + start the installation. + + +B. Using .zip files +------------------- + +These are the normal steps to install Vim from the .zip archives: + +1. Go to the directory where you want to put the Vim files. Examples: + cd C:\ + cd D:\editors + If you already have a "vim" directory, go to the directory in which it is + located. Check the $VIM setting to see where it points to: + set VIM + For example, if you have + C:\vim\vim54 + do + cd C:\ + Binary and runtime Vim archives are normally unpacked in the same location, + on top of each other. + +2. Unpack the zip archives. This will create a new directory "vim\vim74", + in which all the distributed Vim files are placed. Since the directory + name includes the version number, it is unlikely that you overwrite + existing files. + Examples: + pkunzip -d gvim74.zip + unzip vim74w32.zip + + You need to unpack the runtime archive and at least one of the binary + archives. When using more than one binary version, be careful not to + overwrite one version with the other, the names of the executables + "vim.exe" and "gvim.exe" are the same. + + After you unpacked the files, you can still move the whole directory tree + to another location. That is where they will stay, the install program + won't move or copy the runtime files. + + Only for the 32 bit DOS version on MS-DOS without DPMI support (trying to + run install.exe will produce an error message): Unpack the CSDPMI4B.ZIP + archive and follow the instructions in the documentation. + +3. Change to the new directory: + cd vim\vim74 + Run the "install.exe" program. It will ask you a number of questions about + how you would like to have your Vim setup. Among these are: + - You can tell it to write a "_vimrc" file with your preferences in the + parent directory. + - It can also install an "Edit with Vim" entry in the Windows Explorer + popup menu. + - You can have it create batch files, so that you can run Vim from the + console or in a shell. You can select one of the directories in your + $PATH. If you skip this, you can add Vim to the search path manually: + The simplest is to add a line to your autoexec.bat. Examples: + set path=%path%;C:\vim\vim74 + set path=%path%;D:\editors\vim\vim74 + - Create entries for Vim on the desktop and in the Start menu. + +That's it! + + +Remarks: + +- If Vim can't find the runtime files, ":help" won't work and the GUI version + won't show a menubar. Then you need to set the $VIM environment variable to + point to the top directory of your Vim files. Example: + set VIM=C:\editors\vim + Vim version 7.4 will look for your vimrc file in $VIM, and for the runtime + files in $VIM/vim74. See ":help $VIM" for more information. + +- To avoid confusion between distributed files of different versions and your + own modified vim scripts, it is recommended to use this directory layout: + ("C:\vim" is used here as the root, replace it with the path you use) + Your own files: + C:\vim\_vimrc Your personal vimrc. + C:\vim\_viminfo Dynamic info for 'viminfo'. + C:\vim\vimfiles\ftplugin\*.vim Filetype plugins + C:\vim\... Other files you made. + Distributed files: + C:\vim\vim74\vim.exe The Vim version 7.4 executable. + C:\vim\vim74\doc\*.txt The version 7.4 documentation files. + C:\vim\vim74\bugreport.vim A Vim version 7.4 script. + C:\vim\vim74\... Other version 7.4 distributed files. + In this case the $VIM environment variable would be set like this: + set VIM=C:\vim + Then $VIMRUNTIME will automatically be set to "$VIM\vim74". Don't add + "vim74" to $VIM, that won't work. + +- You can put your Vim executable anywhere else. If the executable is not + with the other Vim files, you should set $VIM. The simplest is to add a line + to your autoexec.bat. Examples: + set VIM=c:\vim + set VIM=d:\editors\vim + +- If you have told the "install.exe" program to add the "Edit with Vim" menu + entry, you can remove it by running the "uninstal.exe". See + ":help win32-popup-menu". + +- In Windows 95/98/NT you can create a shortcut to Vim. This works for all + DOS and Win32 console versions. For the console version this gives you the + opportunity to set defaults for the Console where Vim runs in. + + 1. On the desktop, click right to get a menu. Select New/Shortcut. + 2. In the dialog, enter Command line: "C:\command.com". Click "Next". + 3. Enter any name. Click "Finish". + The new shortcut will appear on the desktop. + 4. With the mouse pointer on the new shortcut, click right to get a menu. + Select Properties. + 5. In the Program tab, change the "Cmdline" to add "/c" and the name of the + Vim executable. Examples: + C:\command.com /c C:\vim\vim74\vim.exe + C:\command.com /c D:\editors\vim\vim74\vim.exe + 6. Select the font, window size, etc. that you like. If this isn't + possible, select "Advanced" in the Program tab, and deselect "MS-DOS + mode". + 7. Click OK. + + For gvim, you can use a normal shortcut on the desktop, and set the size of + the Window in your $VIM/_gvimrc: + set lines=30 columns=90 + + +For further information, type one of these inside Vim: + :help dos + :help msdos + :help win32 diff --git a/READMEdir/README_extra.txt b/READMEdir/README_extra.txt new file mode 100644 index 000000000..e496912dc --- /dev/null +++ b/READMEdir/README_extra.txt @@ -0,0 +1,51 @@ +README_extra.txt for version 7.4 of Vim: Vi IMproved. + +These extra files of Vim are for special purposes. This README explains what +the files are for. For general information about Vim, see the "README.txt" +file. + + +farsi/* Files for the Farsi (persian) language. If you don't + know what Farsi is, this is not for you. + +src/if_sniff.* Interface to SNiFF. If you don't know what SNiFF is, + this is not for you. + +src/os_amiga.* Files for the Amiga port. + +src/gui_beos.* +src/os_beos.* Files for the BeOS port. + +src/os_msdos.* +src/os_dos.* Files for the MS-DOS port. + +src/gui_mac.* +src/os_mac.* Files for the Mac port. + +src/os_mint.8 Files for the Atari Mint port. + +src/os_os2* Files for the OS/2 port. +src/tee/* Extra program for OS/2. + +src/os_vms* Files for the VMS port. + +src/os_w32* +src/os_win32.* Files for the Win32 port. + +src/gui_w32.* Files for the Win32 GUI. +src/gui_w48.* Files for the Win32 and Win16 GUI. +src/Make_mvc.mak MS Visual C++ makefile for the Win32 GUI. +runtime/rgb.txt File with color definitions for the Win32 GUI. + +src/if_ole.* OLE automation interface, for MS Windows 95 and NT. + +src/VisVim/* Integration of Win32 GUI with MS Visual Developer + Studio. + +src/GvimExt/* DLL for the "Edit with Vim" context menu entry + +nsis/* NSIS script to build the self-installing MS-Windows exe + +runtime/doc/*.man Preprocessed manual pages. + +runtime/macros/file_select.vim Vim script to browse directories (Unix only). diff --git a/READMEdir/README_mac.txt b/READMEdir/README_mac.txt new file mode 100644 index 000000000..08888d9bb --- /dev/null +++ b/READMEdir/README_mac.txt @@ -0,0 +1,8 @@ +README_mac.txt for version 7.4 of Vim: Vi IMproved. + +This file explains the installation of Vim on Macintosh systems. +See "README.txt" for general information about Vim. + + +Sorry, this text still needs to be written! + diff --git a/READMEdir/README_ole.txt b/READMEdir/README_ole.txt new file mode 100644 index 000000000..233c0532f --- /dev/null +++ b/READMEdir/README_ole.txt @@ -0,0 +1,20 @@ +README_ole.txt for version 7.4 of Vim: Vi IMproved. + +This archive contains gvim.exe with OLE interface and VisVim. +This version of gvim.exe can also load a number of interface dynamically (you +can optionally install the .dll files for each interface). +It is only for MS-Windows 95/98/ME/NT/2000/XP. + +Also see the README_bindos.txt, README_dos.txt and README.txt files. + +Be careful not to overwrite the OLE gvim.exe with the non-OLE gvim.exe when +unpacking another binary archive! Check the output of ":version": + Win32s - "MS-Windows 16/32 bit GUI version" + Win32 - "MS-Windows 32 bit GUI version" +Win32 with OLE - "MS-Windows 32 bit GUI version with OLE support" + +For further information, type this inside Vim: + :help if_ole + +Furthermore, this archive contains VISVIM.DLL. It can be used to integrate +the OLE gvim with Microsoft Visual Developer Studio. See VisVim/README.txt. diff --git a/READMEdir/README_os2.txt b/READMEdir/README_os2.txt new file mode 100644 index 000000000..5f2ebc755 --- /dev/null +++ b/READMEdir/README_os2.txt @@ -0,0 +1,5 @@ +README_os2.txt for version 7.4 of Vim: Vi IMproved. + +This file used to explain the installation of Vim on OS/2 systems. +However, support for OS/2 has been removed in patch 7.4.1008. +See "README.txt" for general information about Vim. diff --git a/READMEdir/README_os390.txt b/READMEdir/README_os390.txt new file mode 100644 index 000000000..502b6f8b1 --- /dev/null +++ b/READMEdir/README_os390.txt @@ -0,0 +1,117 @@ +README_zOS.txt for version 7.4 of Vim: Vi IMproved. + +This readme explains how to build Vim on z/OS. Formerly called OS/390. +See "README.txt" for general information about Vim. + +Most likely there are not many users out there using Vim on z/OS. So chances +are good, that some bugs are still undiscovered. + +Getting the source to z/OS: +========================== + +First get the source code in one big tar file and ftp it a binary to z/OS. If +the tar file is initially compressed with gzip (tar.gz) or bzip2 (tar.bz2) +uncompress it on your PC, as this tools are (most likely) not available on the +mainframe. + +To reduce the size of the tar file you might compress it into a zip file. On +z/OS Unix you might have the command "jar" from java to uncompress a zip. Use: + jar xvf + +Unpack the tar file on z/OS with + pax -o from=ISO8859-1,to=IBM-1047 -rf vim.tar + +Note: The Vim source contains a few bitmaps etc which will be destroyed by +this command, but these files are not needed on zOS (at least not for the +console version). + + +Compiling: +========== + +Vim can be compiled with or without GUI support. For 7.4 only the compilation +without GUI was tested. Below is a section about compiling with X11 but this +is from an earlier version of Vim. + +Console only: +------------- + +If you build VIM without X11 support, compiling and building is nearly +straightforward. + +Change to the vim directory and do: + + # Don't use c89! + # Allow intermixing of compiler options and files. + + $ export CC=cc + $ export _CC_CCMODE=1 + $./configure --with-features=big --without-x --enable-gui=no + $ cd src + $ make + + There may be warnings: + - include files not found (libc, sys/param.h, ...) + - Redeclaration of ... differs from ... + -- just ignore them. + + $ make test + + This will produce lots of garbage on your screen (including error + messages). Don't worry. + + If the test stops at one point in vim (might happen in test 11), just + press :q! + + Expected test failures: + 11: If you don't have gzip installed + 24: test of backslash sequences in regexp are ASCII dependent + 42: Multibyte is not supported on z/OS + 55: ASCII<->EBCDIC sorting + 57: ASCII<->EBCDIC sorting + 58: Spell checking is not supported with EBCDIC + 71: Blowfish encryption doesn't work + + $ make install + + +With X11: +--------- + +WARNING: This instruction was not tested with Vim 7.4. + +There are two ways for building VIM with X11 support. The first way is simple +and results in a big executable (~13 Mb), the second needs a few additional +steps and results in a much smaller executable (~4.5 Mb). This examples assume +you want Motif. + + The easy way: + $ export CC=cc + $ export _CC_CCMODE=1 + $ ./configure --enable-max-features --enable-gui=motif + $ cd src + $ make + + With this VIM is linked statically with the X11 libraries. + + The smarter way: + Make VIM as described above. Then create a file named 'link.sed' with the + following content (see src/link.390): + + s/-lXext *//g + s/-lXmu *//g + s/-lXm */\/usr\/lib\/Xm.x /g + s/-lX11 */\/usr\/lib\/X11.x /g + s/-lXt *//g + s/-lSM */\/usr\/lib\/SM.x /g + s/-lICE */\/usr\/lib\/ICE.x /g + + Then do: + $ rm vim + $ make + + Now Vim is linked with the X11-DLLs. + + See the Makefile and the file link.sh on how link.sed is used. + + diff --git a/READMEdir/README_src.txt b/READMEdir/README_src.txt new file mode 100644 index 000000000..3af95f23c --- /dev/null +++ b/READMEdir/README_src.txt @@ -0,0 +1,8 @@ +README_src.txt for version 7.4 of Vim: Vi IMproved. + +The source archive contains the files needed to compile Vim on Unix systems. +It is packed for Unix systems (NL line separator). + +For more information, see the README.txt file that comes with the runtime +archive (vim-7.4-rt.tar.gz). To be able to run Vim you MUST get the runtime +archive too! diff --git a/READMEdir/README_srcdos.txt b/READMEdir/README_srcdos.txt new file mode 100644 index 000000000..1b7cbcf5c --- /dev/null +++ b/READMEdir/README_srcdos.txt @@ -0,0 +1,12 @@ +README_srcdos.txt for version 7.4 of Vim: Vi IMproved. + +See "README.txt" for general information about Vim. +See "README_dos.txt" for installation instructions for MS-DOS and MS-Windows. +These files are in the runtime archive (vim74rt.zip). + + +The DOS source archive contains the files needed to compile Vim on MS-DOS or +MS-Windows. It is packed for DOS systems, with CR-LF. It also includes the +VisVim sources. + +See "src/INSTALLpc.txt" for instructions on how to compile Vim on the PC. diff --git a/READMEdir/README_unix.txt b/READMEdir/README_unix.txt new file mode 100644 index 000000000..7aff642c6 --- /dev/null +++ b/READMEdir/README_unix.txt @@ -0,0 +1,10 @@ +README_unix.txt for version 7.4 of Vim: Vi IMproved. + +This file explains the installation of Vim on Unix systems. +See "README.txt" for general information about Vim. + + +When you use the source distribution, "make install" is used to install Vim. +See the "INSTALL" file in the "src" directory. + +If you use a compiled package, follow the instructions for the package. diff --git a/READMEdir/README_vms.txt b/READMEdir/README_vms.txt new file mode 100644 index 000000000..53364a127 --- /dev/null +++ b/READMEdir/README_vms.txt @@ -0,0 +1,48 @@ +README_vms.txt for version 7.4 of Vim: Vi IMproved. + +This file explains the installation of Vim on VMS systems. +See "README.txt" in the runtime archive for information about Vim. + + +Most information can be found in the on-line documentation. Use ":help vms" +inside Vim. Or get the runtime files and read runtime/doc/os_vms.txt to find +out how to install and configure Vim with runtime files etc. + +To compile Vim yourself you need three archives: + vim-X.X-rt.tar.gz runtime files + vim-X.X-src.tar.gz source files + vim-X.X-extra.tar.gz extra source files + +Compilation is recommended, in order to make sure that the correct +libraries are used for your specific system. Read about compiling in +src/INSTALLvms.txt. + +To use the binary version, you need one of these archives: + + vim-XX-exe-ia64-gui.zip IA64 GUI/Motif executables + vim-XX-exe-ia64-gtk.zip IA64 GUI/GTK executables + vim-XX-exe-ia64-term.zip IA64 console executables + vim-XX-exe-axp-gui.zip Alpha GUI/Motif executables + vim-XX-exe-axp-gtk.zip Alpha GUI/GTK executables + vim-XX-exe-axp-term.zip Alpha console executables + vim-XX-exe-vax-gui.zip VAX GUI executables + vim-XX-exe-vax-term.zip VAX console executables + +and of course + vim-XX-runtime.zip runtime files + +The binary archives contain: vim.exe, ctags.exe, xxd.exe files, +but there are also prepared "deploy ready" archives: + +vim-XX-ia64.zip GUI and console executables with runtime and + help files for IA64 systems +vim-XX-axp.zip GUI and console executables with runtime and + help files for Alpha systems +vim-XX-vax.zip GUI and console executables with runtime and + help files for VAX systems + +GTK builds need LIBGTK library installed. + +These executables and up to date patches for OpenVMS system are downloadable +from http://www.polarhome.com/vim/ or ftp://ftp.polarhome.com/pub/vim/ + diff --git a/READMEdir/README_w32s.txt b/READMEdir/README_w32s.txt new file mode 100644 index 000000000..0b5d1aee0 --- /dev/null +++ b/READMEdir/README_w32s.txt @@ -0,0 +1,15 @@ +README_w32s.txt for version 7.4 of Vim: Vi IMproved. + +This archive contains the gvim.exe that was specifically compiled for use in +the Win32s subsystem in MS-Windows 3.1 and 3.11. + +Also see the README_bindos.txt, README_dos.txt and README.txt files. + +Be careful not to overwrite the Win32s gvim.exe with the another gvim.exe when +unpacking another binary archive! Check the output of ":version": + Win32s - "MS-Windows 16/32 bit GUI version" + Win32 - "MS-Windows 32 bit GUI version" +Win32 with OLE - "MS-Windows 32 bit GUI version with OLE support" + +For further information, type this inside Vim: + :help win32s -- cgit v1.2.1