[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
304/376: Combine introduction / quick start parts
From: |
Ludovic Courtès |
Subject: |
304/376: Combine introduction / quick start parts |
Date: |
Wed, 28 Jan 2015 22:05:47 +0000 |
civodul pushed a commit to tag 1.8
in repository guix.
commit 2b74354e5226cda44aa23e8868aaecba6f6250d8
Author: Eelco Dolstra <address@hidden>
Date: Mon Nov 24 14:53:50 2014 +0100
Combine introduction / quick start parts
---
doc/manual/introduction/introduction.xml | 1 +
.../quick-start.xml} | 9 ++++++---
doc/manual/manual.xml | 3 ++-
doc/manual/quick-start/quick-start.xml | 17 -----------------
4 files changed, 9 insertions(+), 21 deletions(-)
diff --git a/doc/manual/introduction/introduction.xml
b/doc/manual/introduction/introduction.xml
index 665fef2..12b2cc7 100644
--- a/doc/manual/introduction/introduction.xml
+++ b/doc/manual/introduction/introduction.xml
@@ -7,5 +7,6 @@
<title>Introduction</title>
<xi:include href="about-nix.xml" />
+<xi:include href="quick-start.xml" />
</part>
diff --git a/doc/manual/quick-start/getting-started.xml
b/doc/manual/introduction/quick-start.xml
similarity index 92%
rename from doc/manual/quick-start/getting-started.xml
rename to doc/manual/introduction/quick-start.xml
index 3dc79b9..396b7b1 100644
--- a/doc/manual/quick-start/getting-started.xml
+++ b/doc/manual/introduction/quick-start.xml
@@ -2,11 +2,14 @@
xmlns:xlink="http://www.w3.org/1999/xlink"
xmlns:xi="http://www.w3.org/2001/XInclude"
version="5.0"
- xml:id="ch-getting-started-nix">
+ xml:id="chap-quick-start">
-<title>Getting Started with Nix</title>
+<title>Quick Start</title>
+
+<para>This chapter is for impatient people who don't like reading
+documentation. For more in-depth information you are kindly referred
+to subsequent chapters.</para>
-<para>This tutorial takes you through the basic tasks you might perform when
you start using Nix.</para>
<procedure>
<step><para>Install single-user Nix by running the following:
diff --git a/doc/manual/manual.xml b/doc/manual/manual.xml
index 4522f81..5c46f30 100644
--- a/doc/manual/manual.xml
+++ b/doc/manual/manual.xml
@@ -29,14 +29,15 @@
</info>
+ <!--
<preface>
<title>Preface</title>
<para>This manual describes how to set up and use the Nix package
manager.</para>
</preface>
+ -->
<xi:include href="introduction/introduction.xml" />
- <xi:include href="quick-start/quick-start.xml" />
<xi:include href="installation/installation.xml" />
<xi:include href="packages/package-management.xml" />
<xi:include href="expressions/writing-nix-expressions.xml" />
diff --git a/doc/manual/quick-start/quick-start.xml
b/doc/manual/quick-start/quick-start.xml
deleted file mode 100644
index b4757cb..0000000
--- a/doc/manual/quick-start/quick-start.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<part xmlns="http://docbook.org/ns/docbook"
- xmlns:xlink="http://www.w3.org/1999/xlink"
- xmlns:xi="http://www.w3.org/2001/XInclude"
- version="5.0"
- xml:id="chap-quick-start">
-
-<title>Quick-Start</title>
-
-<partintro>
-<para>This section is for impatient people who don't like reading
-documentation. For more in-depth information you are kindly referred
-to subsequent chapters.</para>
-</partintro>
-
-<xi:include href="getting-started.xml" />
-
-</part>
- 235/376: createDirs(): Handle ‘path’ being a symlink, (continued)
- 235/376: createDirs(): Handle ‘path’ being a symlink, Ludovic Courtès, 2015/01/28
- 238/376: Add test for readDir primop, Ludovic Courtès, 2015/01/28
- 240/376: Remove some duplicate code, Ludovic Courtès, 2015/01/28
- 239/376: Add readDir primop, Ludovic Courtès, 2015/01/28
- 224/376: add manpage for nix-generate-patches, Ludovic Courtès, 2015/01/28
- 246/376: Typo, Ludovic Courtès, 2015/01/28
- 245/376: Get rid of some unnecessary ExprConcatStrings nodes in dynamic attrs, Ludovic Courtès, 2015/01/28
- 243/376: Add primop ‘catAttrs’, Ludovic Courtès, 2015/01/28
- 249/376: nix-copy-closure: Use strict, Ludovic Courtès, 2015/01/28
- 241/376: Tweak, Ludovic Courtès, 2015/01/28
- 304/376: Combine introduction / quick start parts,
Ludovic Courtès <=
- 250/376: Remove unused @sshOpts flag, Ludovic Courtès, 2015/01/28
- 305/376: Update quick start section, Ludovic Courtès, 2015/01/28
- 306/376: Update installation section, Ludovic Courtès, 2015/01/28
- 308/376: Build derivations in a more predictable order, Ludovic Courtès, 2015/01/28
- 307/376: Don't create unnecessary substitution goals for derivations, Ludovic Courtès, 2015/01/28
- 309/376: More build-cache-failures -> build-cache-failure, Ludovic Courtès, 2015/01/28
- 310/376: forceString(): Accept pos argument, Ludovic Courtès, 2015/01/28
- 311/376: Add a primop for regular expression pattern matching, Ludovic Courtès, 2015/01/28
- 312/376: Rely on XML catalogs to find the DocBook schemas and stylesheets, Ludovic Courtès, 2015/01/28
- 313/376: Intro: Mention binary caches, Ludovic Courtès, 2015/01/28