ShuriZma
/
pcsx2
mirror of https://github.com/PCSX2/pcsx2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #428 from pgert/master 

Case Mapping & GitHub instead of GoogleCode.
This commit is contained in:
Gregory Hainaut 2015-01-16 21:25:36 +01:00
parent 1295b46a49 abb005e6e2
commit 6bb945f6c8
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
bin/docs/pcsx2.1
View File

@ -1,13 +1,13 @@
.TH "pcsx2" "1" .TH "pcsx2" "1"
.SH NAME .SH NAME
PCSX2 - Playstation 2 console emulator PCSX2 - PlayStation(R)2 console emulator
.SH DESCRIPTION .SH DESCRIPTION
PCSX2 is an emulator for the playstation 2 video game console. It is written mostly in C++, some part are in C and x86 assembly. PCSX2 is an emulator for the PlayStation(R)2 video game console. It is written mostly in C++, some part are in C and x86 assembly.
There is still lot of on going work to improve compatibility & speed. There is still lot of on going work to improve compatibility & speed.
Visit http://pcsx2.net & http://code.google.com/p/pcsx2 for the latest updates. Visit http://pcsx2.net & https://github.com/PCSX2/pcsx2 for the latest updates.
.SH Options .SH Options
Note: all options can also be updated in the GUI. Note: all options can also be updated in the GUI.
@ -46,7 +46,7 @@ Disables display of the gui on exit (program auto-exits).
.TP .TP
.B --nodisc .B --nodisc
Boots with an empty dvd tray. Use this to boot into the PS2 system menu. Boots with an empty DVD tray. Use this to boot into the PS2 system menu.
.TP .TP
.B --usecd .B --usecd

2
pcsx2/gui/AppInit.cpp
View File

@ -225,7 +225,7 @@ void Pcsx2App::OnInitCmdLine( wxCmdLineParser& parser )
parser.AddSwitch( wxEmptyString,L"noguiprompt", _("when nogui - prompt before exiting on suspend") ); parser.AddSwitch( wxEmptyString,L"noguiprompt", _("when nogui - prompt before exiting on suspend") );
parser.AddOption( wxEmptyString,L"elf", _("executes an ELF image"), wxCMD_LINE_VAL_STRING ); parser.AddOption( wxEmptyString,L"elf", _("executes an ELF image"), wxCMD_LINE_VAL_STRING );
parser.AddSwitch( wxEmptyString,L"nodisc", _("boots an empty dvd tray; use to enter the PS2 system menu") ); parser.AddSwitch( wxEmptyString,L"nodisc", _("boots an empty DVD tray; use to enter the PS2 system menu") );
parser.AddSwitch( wxEmptyString,L"usecd", _("boots from the CDVD plugin (overrides IsoFile parameter)") ); parser.AddSwitch( wxEmptyString,L"usecd", _("boots from the CDVD plugin (overrides IsoFile parameter)") );
parser.AddSwitch( wxEmptyString,L"nohacks", _("disables all speedhacks") ); parser.AddSwitch( wxEmptyString,L"nohacks", _("disables all speedhacks") );

2
plugins/CDVDpeops/Cfg.c
View File

@ -348,7 +348,7 @@ BOOL OnInitCDRDialog(HWND hW)
ComboBox_AddString(hWC,"Read ahead - fast, reads more sectors at once"); ComboBox_AddString(hWC,"Read ahead - fast, reads more sectors at once");
ComboBox_AddString(hWC,"Async read - faster, additional asynchronous reads"); ComboBox_AddString(hWC,"Async read - faster, additional asynchronous reads");
ComboBox_AddString(hWC,"Thread read - fast with IOCTL, always async reads"); ComboBox_AddString(hWC,"Thread read - fast with IOCTL, always async reads");
ComboBox_AddString(hWC,"Smooth read - for drives with ps2 cd/dvd reading troubles"); ComboBox_AddString(hWC,"Smooth read - for drives with PS2 CD/DVD reading troubles");
ComboBox_SetCurSel(hWC,iUseCaching); ComboBox_SetCurSel(hWC,iUseCaching);
if(iUseDataCache) if(iUseDataCache)