Skip to content

Commit faa844a

Browse files
committed
Merge branch 'stable'
2 parents aa233de + 2b44bb8 commit faa844a

File tree

3 files changed

+20
-5
lines changed

3 files changed

+20
-5
lines changed

doc/GUIDE.md

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1480,6 +1480,21 @@ environment variable or using Stack's `--stack-root` option on the command line.
14801480
`~/.config/stack` on Unix-like operating systems and `%APPDIR%\stack` on
14811481
Windows.
14821482

1483+
This approach treats:
1484+
1485+
* the project-level YAML configuration file that is common to all projects
1486+
without another such file in their project directory or its ancestor
1487+
directories as _data_ rather than as part of Stack's own
1488+
_configuration_;
1489+
1490+
* the snapshots database as essential data rather than as non-essential
1491+
data that would be part of a _cache_, notwithstanding that Stack will
1492+
rebuild that database as its contents are needed; and
1493+
1494+
* the Pantry store as essential data rather than as non-essential data
1495+
that would be part of a _cache_, notwithstanding that Stack will
1496+
download the package index and rebuild the store if it is absent.
1497+
14831498
The location of the Stack root is reported by command:
14841499

14851500
~~~text

doc/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -335,7 +335,7 @@ The following assumes that you already have installed a version of Stack and the
335335
1. Clone the `stack` repository from GitHub with the command:
336336

337337
~~~text
338-
git clone https://github.com/commercialhaskell/stack.git`
338+
git clone https://github.com/commercialhaskell/stack.git
339339
~~~
340340
341341
2. Change the current working directory to the cloned `stack` directory with the

doc/install_and_upgrade.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -207,24 +207,24 @@ GitHub repository.
207207
There is also an unofficial package for openSUSE or SUSE Linux
208208
Enterprise. Its Stack version may lag behind. To install it:
209209

210-
=== openSUSE Tumbleweed
210+
=== "openSUSE Tumbleweed"
211211

212212
~~~text
213213
sudo zypper in stack
214214
~~~
215215

216-
=== openSUSE Leap
216+
=== "openSUSE Leap"
217217

218218
~~~text
219219
sudo zypper ar http://download.opensuse.org/repositories/devel:/languages:/haskell/openSUSE_Leap_42.1/devel:languages:haskell.repo
220220
sudo zypper in stack
221221
~~~
222222

223-
=== SUSE Linux Enterprise 12
223+
=== "SUSE Linux Enterprise 12"
224224

225225
~~~text
226226
sudo zypper ar http://download.opensuse.org/repositories/devel:/languages:/haskell/SLE_12/devel:languages:haskell.repo
227-
sude zypper in stack
227+
sudo zypper in stack
228228
~~~
229229

230230
=== "Ubuntu"

0 commit comments

Comments
 (0)