Index: manual/working_with_playlists/main.tex =================================================================== --- manual/working_with_playlists/main.tex (revision 15914) +++ manual/working_with_playlists/main.tex (working copy) @@ -169,7 +169,7 @@ \subsubsection{Through the \setting{Playlist catalog}} The \setting{Playlist catalog} offers a shortcut to all playlists in your -\daps{} harddisk root folder called \fname{/Playlists}. +\daps{} harddisk root directory called \fname{/Playlists}. It can be used like the \setting{File Browser}. \subsection{Helpful Hints} Index: manual/plugins/batterybenchmark.tex =================================================================== --- manual/plugins/batterybenchmark.tex (revision 15914) +++ manual/plugins/batterybenchmark.tex (working copy) @@ -13,7 +13,7 @@ another plugin. If you happen to load a plugin while benchmarking, a splash screen will inform you about the termination of the benchmark. While you operate it will log various battery related information every time -the disk is activated by external causes, (buffer refill, open folder, +the disk is activated by external causes, (buffer refill, open directory, USB mode) or an hour passes without updating the log file.\\ The plugin will continue to log info until: Index: manual/plugins/doom.tex =================================================================== --- manual/plugins/doom.tex (revision 15914) +++ manual/plugins/doom.tex (working copy) @@ -15,7 +15,7 @@ The needed files can be found at \wikilink{PluginDoom} -To play addon wads create the \fname{addons} directory within the doom folder. +To play addon wads create the \fname{addons} directory within the doom directory. Place \fname{wad} files in this directory. Currently doom only supports a maximum number of 10 addons in the directory. Index: manual/plugins/stats.tex =================================================================== --- manual/plugins/stats.tex (revision 15914) +++ manual/plugins/stats.tex (working copy) @@ -3,8 +3,8 @@ The stats-plugin simply counts the number of files% \opt{h1xx,h300,ipodcolor,ipod3g,ipod4g,ipodmini,ipodnano,ipodvideo}{, music files } -and folders on your \dap. Press % +and directories on your \dap. Press % \opt{player}{\ButtonStop} \opt{recorder,recorderv2,ondio,h1xx,h300}{\ButtonOff} \opt{ipodcolor,ipod3g,ipod4g,ipodmini,ipodnano,ipodvideo}{\fixme:TBD} -to exit the plugin. \ No newline at end of file +to exit the plugin. Index: manual/plugins/jpegviewer.tex =================================================================== --- manual/plugins/jpegviewer.tex (revision 15914) +++ manual/plugins/jpegviewer.tex (working copy) @@ -43,7 +43,7 @@ \opt{IRIVER_H10_PAD}{\ButtonFF} \opt{SANSA_E200_PAD}{\ButtonScrollDown} \opt{GIGABEAT_PAD}{\ButtonA+\ButtonRight} - & Next jpeg in folder\\ + & Next jpeg in directory\\ \opt{RECORDER_PAD}{\ButtonFTwo} \opt{ONDIO_PAD}{\ButtonMenu+\ButtonLeft} \opt{IRIVER_H100_PAD,IAUDIO_X5_PAD}{\ButtonRec} @@ -52,7 +52,7 @@ \opt{IRIVER_H10_PAD}{\ButtonRew} \opt{SANSA_E200_PAD}{\ButtonScrollUp} \opt{GIGABEAT_PAD}{\ButtonA+\ButtonLeft} - & Previous jpeg in folder\\ + & Previous jpeg in directory\\ \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOff} \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonSelect+\ButtonMenu} \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD}{\ButtonPower} Index: manual/advanced_topics/main.tex =================================================================== --- manual/advanced_topics/main.tex (revision 15914) +++ manual/advanced_topics/main.tex (working copy) @@ -12,7 +12,7 @@ Rockbox can load fonts dynamically. Simply copy the \fname{.fnt} file to the \dap{} and ``play'' it in the \setting{File Browser}. If you want a font to be loaded automatically every time you start up, it must be located in the - \fname{/.rockbox/fonts} folder and the filename must be at most 24 characters + \fname{/.rockbox/fonts} directory and the filename must be at most 24 characters long. You can browse the fonts in \fname{/.rockbox/fonts} under \setting{Settings $\rightarrow$ General Settings $\rightarrow$ Display $\rightarrow$ Browse Fonts} in the \setting{Main Menu}. @@ -30,7 +30,7 @@ General Settings $\rightarrow$ Languages }from the \setting{Main Menu}. \note{If you want a language to be loaded automatically every time you start -up, it must be located in the \fname{/.rockbox/langs} folder and the filename +up, it must be located in the \fname{/.rockbox/langs} directory and the filename must be a maximum of 24 characters long.} If your language is not yet supported and you want to write your own language @@ -57,7 +57,7 @@ (see \reference{ref:Filemenu}) on it and select the option \setting{Set As Backdrop}. If you want rockbox to remember your backdrop the next time you start your \dap{} the backdrop must be placed in - the \fname{/.rockbox/backdrops} folder. + the \fname{/.rockbox/backdrops} directory. }% \section{\label{ref:ConfiguringtheWPS}Configuring the WPS} @@ -82,7 +82,7 @@ \item [File Location: ]Custom WPS files may be located anywhere on the drive. The only restriction is that they must end in \fname{.wps}. When you ``play'' a \fname{.wps} file, it will be used for future WPS screens, and if the - ``played'' \fname{.wps} file is located in the \fname{/.rockbox/wps} folder, it + ``played'' \fname{.wps} file is located in the \fname{/.rockbox/wps} directory, it will be remembered and used after reboot. The \fname{.wps} filename must be no more than 24 characters long for it to be remembered. \end{description} @@ -377,7 +377,7 @@ \section{\label{ref:FirmwareLoading}Firmware Loading} \opt{player,recorder,recorderv2fm,ondio}{ When your \dap{} powers on, it loads the Archos firmware in ROM, which - automatically checks your \daps{} root folder for a file named + automatically checks your \daps{} root directory for a file named \firmwarefilename. Note that Archos firmware can only read the first ten characters of each filename in this process, so don't rename your old firmware files with names like \firmwarefilename.\fname{old} and so on, Index: manual/advanced_topics/archos-flashing.tex =================================================================== --- manual/advanced_topics/archos-flashing.tex (revision 15914) +++ manual/advanced_topics/archos-flashing.tex (working copy) @@ -222,7 +222,7 @@ \item When done, you can restart the box and hopefully your new Rockbox image. \end{enumerate} -You may find two \fname{.ucl} files in the \fname{.rockbox} folder. The +You may find two \fname{.ucl} files in the \fname{.rockbox} directory. The classical, compressed one is \fname{rockbox.ucl}. If your model has enough flash space left, there may be an additional \fname{rombox.ucl}, which is uncompressed and can run directly from flash ROM, saving some RAM. The second way is the newer Index: manual/preamble.tex =================================================================== --- manual/preamble.tex (revision 15914) +++ manual/preamble.tex (working copy) @@ -12,7 +12,7 @@ % Copyright (C) 2006 The Rockbox Manual Team % % All files in this archive are subject to the GNU Free Documentation License -% See the file COPYING-MANUAL in the source tree docs/ folder for full license +% See the file COPYING-MANUAL in the source tree docs/ directory for full license % agreement. % % Contributors are listed in the file docs/CREDITS-MANUAL Index: manual/getting_started/installation.tex =================================================================== --- manual/getting_started/installation.tex (revision 15914) +++ manual/getting_started/installation.tex (working copy) @@ -113,7 +113,7 @@ \fname{.zip} format. Thus you need a tool to handle that compressed format. Usually your computer should have a tool installed that can handle the \fname{.zip} file format. Windows XP has built-in support for - \fname{.zip} files and presents them to you as folders unless you have + \fname{.zip} files and presents them to you as directories unless you have installed a third party program that handles compressed files. For other operating systems this may vary. If the \fname{.zip} file format is not recognised on your computer you can find a program to handle them @@ -246,7 +246,7 @@ Note that the entire contents of the \fname{.zip} file should be extracted directly to the root of your \daps{} drive. Do not try to -create a separate directory or folder on your \dap{} for the Rockbox +create a separate directory on your \dap{} for the Rockbox files! The \fname{.zip} file already contains the internal directory structure that Rockbox needs. @@ -255,9 +255,9 @@ \opt{archos}{ \note{ If the contents of the \fname{.zip} file are extracted correctly, you will - have a file called \fname{\firmwarefilename} in the main folder of your - \daps{} drive, and also a folder called \fname{/.rockbox}, which contains a - number of other folders and system files needed by Rockbox. If you receive a + have a file called \fname{\firmwarefilename} in the main directory of your + \daps{} drive, and also a directory called \fname{/.rockbox}, which contains a + number of other directories and system files needed by Rockbox. If you receive a ``-1'' error when you start Rockbox, you have not extracted the contents of the \fname{.zip} file to the proper location. } @@ -268,8 +268,8 @@ \opt{SWCODEC}{ \note{ If the contents of the \fname{.zip} file are extracted correctly, you will - have a folder called \fname{/.rockbox}, which contains all the files needed - by Rockbox, in the main folder of your \daps{} drive. If you receive a + have a directory called \fname{/.rockbox}, which contains all the files needed + by Rockbox, in the main directory of your \daps{} drive. If you receive a ``-1'' error when you start Rockbox, you have not extracted the contents of the \fname{.zip} file to the proper location. } @@ -295,7 +295,7 @@ \fname{.zip} file onto your \dap{}. As with the firmware installation, the entire contents of the fonts \fname{.zip} should be extracted directly to the root of your \daps{} drive. Do not try to create a separate directory or - folder on your \dap{} for the fonts! The \fname{.zip} already contains the + directory on your \dap{} for the fonts! The \fname{.zip} already contains the correct internal directory structure. \end{enumerate} @@ -317,7 +317,7 @@ If you wish to use speech support you will also need a voice file, english ones are available from \url{http://www.rockbox.org/daily.shtml}. Download the ``voice'' for your player, rename it to \fname{english.voice}, copy it -into the \fname{langs} folder which is inside the \fname{/.rockbox} folder on +into the \fname{langs} directory which is inside the \fname{/.rockbox} directory on your \dap{} and reboot. Voice menus are turned on by default. See \reference{ref:Voiceconfiguration} for details on voice settings. @@ -339,7 +339,7 @@ Rockbox starts in the \setting{File Browser}. If you have loaded music onto your player using Itunes, you will not be able to see your music because Itunes changes your files' names and hides them in directories in the - \fname{Ipod\_Control} folder. You can view files placed on your \dap{} by + \fname{Ipod\_Control} directory. You can view files placed on your \dap{} by Itunes by initializing and using Rockbox's database. See \reference{ref:database} for more information. } @@ -420,7 +420,7 @@ installing the distribution files. \opt{h1xx}{ The Rockbox bootlaoder will automatically start the original firmware if - the \fname{.rockbox} folder has been deleted. + the \fname{.rockbox} directory has been deleted. }% \opt{h300}{% Although if you retain the Rockbox boot loader, you will need to hold the @@ -430,7 +430,7 @@ } If you wish to clean up your disk, you may also wish to delete the -\fname{.rockbox} folder and its contents. +\fname{.rockbox} directory and its contents. \nopt{m5,x5}{Turn the \playerman{} off. Turn the \dap{} back on and the original \playerman{} software will load. } Index: manual/getting_started/iriver_install.tex =================================================================== --- manual/getting_started/iriver_install.tex (revision 15914) +++ manual/getting_started/iriver_install.tex (working copy) @@ -60,7 +60,7 @@ \item Turn on your \playerman{} and connect it to your computer via USB. % \item Copy or move the modified \fname{.hex} file directly to the root of - your \daps{} drive. Do not put it inside a folder on your \dap. + your \daps{} drive. Do not put it inside a directory on your \dap. % \item Disconnect the jukebox from USB. (Be sure to use Windows' ``safely remove hardware'' option.) Index: manual/getting_started/gigabeat_install.tex =================================================================== --- manual/getting_started/gigabeat_install.tex (revision 15914) +++ manual/getting_started/gigabeat_install.tex (working copy) @@ -9,14 +9,14 @@ \begin{itemize} \item Download the Rockbox bootloader from \url{http://download.rockbox.org/bootloader/gigabeat/} -\item Starting at the root folder of your player browse into the folder - \fname{GBSYSTEM} and from that into the subfolder \fname{FWIMG}. - These folders are hidden. Make sure that you have configured your browser +\item Starting at the root directory of your player browse into the directory + \fname{GBSYSTEM} and from that into the subdirectory \fname{FWIMG}. + These directories are hidden. Make sure that you have configured your browser to show hidden files or you may be unable to see \fname{FWIMG}. -\item In that folder you'll find a file called \fname{FWIMG01.DAT}. This too +\item In that directory you'll find a file called \fname{FWIMG01.DAT}. This too may be hidden. Rename the file to \fname{FWIMG01.DAT.ORIG}. Make sure you spelled that name correctly as it is needed for booting the \playerman{} firmware. -\item Now copy the file \fname{FWIMG01.DAT} you downloaded to that folder. +\item Now copy the file \fname{FWIMG01.DAT} you downloaded to that directory. Make sure the spelling is correct. \end{itemize} Index: manual/getting_started/h10_install.tex =================================================================== --- manual/getting_started/h10_install.tex (revision 15914) +++ manual/getting_started/h10_install.tex (working copy) @@ -30,7 +30,7 @@ \item Rename the \opt{h10}{\fname{H10\_20GC.mi4}}\opt{h10_5gb}{\fname{H10.mi4}} file to \fname{OF.mi4} in the \fname{System} directory on your \playertype{}. \opt{h10_5gb}{\note{If you have a Pure model \playertype{} (which doesn't have a FM radio) it is possible that this file will be called \fname{H10EMP.mi4} instead. If so, rename the \fname{H10.mi4} you downloaded in step 1 to \fname{H10EMP.mi4}.}} \note{You should keep a safe backup of this file for use if you ever wish to switch back to the \playerman{} firmware.} - \note{If you can't see the \fname{System} directory, you will need to make sure your operating system is configured to show hidden files and folders.} + \note{If you can't see the \fname{System} directory, you will need to make sure your operating system is configured to show hidden files and directories.} \item Copy the \opt{h10}{\fname{H10\_20GC.mi4}}\opt{h10_5gb}{\fname{H10.mi4} (or \fname{H10EMP.mi4} if you have a \playertype{} Pure)} file you downloaded to the System directory on your \dap{}. -\end{enumerate} \ No newline at end of file +\end{enumerate} Index: manual/rockbox_interface/main.tex =================================================================== --- manual/rockbox_interface/main.tex (revision 15914) +++ manual/rockbox_interface/main.tex (working copy) @@ -360,8 +360,8 @@ the selection. Use \ActionStdOk{} to select an item. When browsing the file system selecting an audio file plays it. The view switches to the ``While playing screen'', usually abbreviated as ``WPS'' (see \reference{ref:WPS}. The -dynamic playlist gets replaced with the contents of the current folder. This -way you can easily treat folders as playlists. The created dynamic playlist can +dynamic playlist gets replaced with the contents of the current directory. This +way you can easily treat directories as playlists. The created dynamic playlist can be extended or modified while playing. This is also known as ``on-the-fly playlist''. To go back to the \setting{File Browser} stop the playback with the @@ -375,7 +375,7 @@ a so-called ``dynamic playlist'' is generated, unless you play a saved playlist. You can modify the dynamic playlist while playing and also save it to a file. If you don't want to use playlists you can simply play your -files folder based. +files directory based. Playlists are covered in detail in \reference{ref:working_with_playlists}. \subsubsection{Menu} @@ -389,7 +389,7 @@ The contents of the context menu vary, depending on the situation it gets called. The context menu itself presents you with some operations you can perform with the currently highlighted file. In the file browser this is -the file (or folder) that is highlighted by the cursor. From the WPS this is +the file (or directory) that is highlighted by the cursor. From the WPS this is the currently playing file. Also there are some actions that don't apply to the current file but refer to the screen from which the context menu gets called. One example is the playback menu, which can be called using Index: manual/rockbox_interface/browsing_and_playing.tex =================================================================== --- manual/rockbox_interface/browsing_and_playing.tex (revision 15914) +++ manual/rockbox_interface/browsing_and_playing.tex (working copy) @@ -3,8 +3,8 @@ \section{\label{ref:file_browser}File Browser} \screenshot{rockbox_interface/images/ss-file-browser}{The file browser}{} Rockbox lets you browse your music in either of two ways. The -\setting{File Browser} lets you navigate through the files and folders on -your \dap, entering folders and executing the default action on each file. +\setting{File Browser} lets you navigate through the files and directories on +your \dap, entering directories and executing the default action on each file. To help differentiate files, each file format is displayed with an icon. The \setting{Database Browser}, on the other hand, allows you to navigate @@ -29,14 +29,14 @@ MultiMediaCard, this means the \dap{} can access both data volumes (internal memory and the MMC), thus being able to for instance, build playlists with files from both volumes. -In the \setting{File Browser} a new folder will appear as soon as the device -has read the content after inserting the card. This new folder's name is -generated as \fname{}, and will behave exactly as any other folder +In the \setting{File Browser} a new directory will appear as soon as the device +has read the content after inserting the card. This new directory's name is +generated as \fname{}, and will behave exactly as any other directory on the \dap{}. } \opt{h10,h10_5gb}{\note{ -If your \dap{} is a MTP model, the Music folder where all your music is stored +If your \dap{} is a MTP model, the Music directory where all your music is stored may be hidden in the \setting{File Browser}. This may be fixed by either either changing it's properties (on a computer) to not hidden, or by changing the \setting{Show Files} setting to all. @@ -103,12 +103,12 @@ \screenshot{rockbox_interface/images/ss-file-menu}{The File Menu}{} The \setting{File Menu} allows you to perform certain operations on files or -folders. To access the \setting{File Menu}, position the selector over a file -or folder and access the context menu with \ActionStdContext{}. +directories. To access the \setting{File Menu}, position the selector over a file +or directory and access the context menu with \ActionStdContext{}. \note{The \setting{File Menu} is a context sensitive menu. If the \setting{File Menu} is invoked on a file, it will display options available -for files. If the \setting{File Menu} is invoked on a folder or directory, +for files. If the \setting{File Menu} is invoked on a directory, it will display options for directories.} The \setting{File Menu} contains the following options (unless otherwise noted, @@ -137,7 +137,7 @@ Press \ActionYesNoAccept{} to confirm deletion or any other key to cancel. \item [Delete Directory.] - Deletes the currently selected directory and all of the files and folders + Deletes the currently selected directory and all of the files and directories contained in the selected directory. Deleted directories cannot be recovered. Use this feature with caution! \item [Open with.] Index: manual/intro/main.tex =================================================================== --- manual/intro/main.tex (revision 15914) +++ manual/intro/main.tex (working copy) @@ -12,7 +12,7 @@ % Copyright (C) 2006 The Rockbox Manual Team % % All files in this archive are subject to the GNU Free Documentation License -% See the file COPYING-MANUAL in the source tree docs/ folder for full license +% See the file COPYING-MANUAL in the source tree docs/ directory for full license % agreement. % % Contributors are listed in the file docs/CREDITS-MANUAL Index: manual/configure_rockbox/bookmarking.tex =================================================================== --- manual/configure_rockbox/bookmarking.tex (revision 15914) +++ manual/configure_rockbox/bookmarking.tex (working copy) @@ -1,9 +1,9 @@ % $Id$ % \section{\label{ref:Bookmarkconfigactual}Bookmarking} Bookmarks allow you to save your current position within a track so that - you can return to it at a later time. Bookmarks are saved on a per folder - basis. In other words, all of the files in the same folder have their - bookmarks stored together in the folder where the files are located. You + you can return to it at a later time. Bookmarks are saved on a per directory + basis. In other words, all of the files in the same directory have their + bookmarks stored together in the directory where the files are located. You can store multiple bookmarks for the same track. \begin{description} \item [Bookmark on Stop. ]This option controls whether Rockbox writes a Index: manual/configure_rockbox/file_view.tex =================================================================== --- manual/configure_rockbox/file_view.tex (revision 15914) +++ manual/configure_rockbox/file_view.tex (working copy) @@ -10,9 +10,9 @@ case letters. If this option is set to NO, then case will be ignored when sorting files. \item[Sort Directories:] - This option controls how Rockbox sorts folders. The default is to sort - them alphabetically. \setting{By date} sorts them with the oldest folder first. - \setting{By newest date} sorts them with the newest folder first. + This option controls how Rockbox sorts directories. The default is to sort + them alphabetically. \setting{By date} sorts them with the oldest directory first. + \setting{By newest date} sorts them with the newest directory first. \item[Sort Files:] This option controls how Rockbox sorts files. All of the options for @@ -30,7 +30,7 @@ files supported by Rockbox (see \reference{ref:Supportedfileformats}). Files and directories starting with \fname{.} (\emph{dot}) or with the \emph{hidden} flag set are hidden. - \item[Music:] The \setting{File Browser} displays only folders, playlists and + \item[Music:] The \setting{File Browser} displays only directories, playlists and the supported \emph{audio} file formats. Extensions are stripped. Files and directories starting with \fname{.} or with the ``hidden'' flag set are hidden. Index: manual/main_menu/main.tex =================================================================== --- manual/main_menu/main.tex (revision 15914) +++ manual/main_menu/main.tex (working copy) @@ -127,7 +127,7 @@ \begin{description} \item[Create Playlist:] Rockbox will create a playlist with all tracks in the current directory -and all sub-directories. The playlist will be created one folder level ``up'' +and all sub-directories. The playlist will be created one directory level ``up'' from where you currently are. \item[View Current Playlist:]